diff --git a/src/chat/client.nim b/src/chat/client.nim
index 5f1901b..ee52046 100644
--- a/src/chat/client.nim
+++ b/src/chat/client.nim
@@ -15,12 +15,6 @@ import # Foreign
   tables,
   types
 
-import
-  waku/[
-    waku_node,
-    discovery/waku_dnsdisc
-  ]
-
 import #local
   conversations,
   conversations/convo_impl,
@@ -50,7 +44,7 @@ type
 
 type KeyEntry* = object
   keyType: string
-  privateKey: crypto.PrivateKey
+  privateKey: PrivateKey
   timestamp: int64
 
 type Client* = ref object
@@ -293,17 +287,6 @@ proc start*(client: Client) {.async.} =
 
   client.isRunning = true
 
-  let dnsDiscoveryUrl = "enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im"
-  let nameServer = parseIpAddress("1.1.1.1")
-  let discoveredPeers = await retrieveDynamicBootstrapNodes(dnsDiscoveryUrl, @[nameServer])
-  if discoveredPeers.isOk:
-    info "Connecting to discovered peers"
-    let remotePeers = discoveredPeers.get()
-    info "Discovered and connecting to peers", peerCount = remotePeers.len
-    asyncSpawn client.ds.node.connectToNodes(remotePeers)
-  else:
-    warn "Failed to find peers via DNS discovery", error = discoveredPeers.error
-
   asyncSpawn client.messageQueueConsumer()
 
   notice "Client start complete", client = client.getId()
diff --git a/src/chat/delivery/waku_client.nim b/src/chat/delivery/waku_client.nim
index 1a04d2c..efff71e 100644
--- a/src/chat/delivery/waku_client.nim
+++ b/src/chat/delivery/waku_client.nim
@@ -15,6 +15,7 @@ import
     waku_node,
     waku_enr,
     discovery/waku_discv5,
+    discovery/waku_dnsdisc,
     factory/builder,
     waku_filter_v2/client,
   ]
@@ -161,6 +162,17 @@ proc start*(client: WakuClient) {.async.} =
 
   client.node.peerManager.start()
 
+  let dnsDiscoveryUrl = "enrtree://AIRVQ5DDA4FFWLRBCHJWUWOO6X6S4ZTZ5B667LQ6AJU6PEYDLRD5O@sandbox.waku.nodes.status.im"
+  let nameServer = parseIpAddress("1.1.1.1")
+  let discoveredPeers = await retrieveDynamicBootstrapNodes(dnsDiscoveryUrl, @[nameServer])
+  if discoveredPeers.isOk:
+    info "Connecting to discovered peers"
+    let remotePeers = discoveredPeers.get()
+    info "Discovered and connecting to peers", peerCount = remotePeers.len
+    asyncSpawn client.node.connectToNodes(remotePeers)
+  else:
+    warn "Failed to find peers via DNS discovery", error = discoveredPeers.error
+
   let subscription: SubscriptionEvent = (kind: PubsubSub, topic:
     client.cfg.pubsubTopic)