diff --git a/packages/dns-discovery/src/index.ts b/packages/dns-discovery/src/index.ts
index e702828e37..d768ff2647 100644
--- a/packages/dns-discovery/src/index.ts
+++ b/packages/dns-discovery/src/index.ts
@@ -96,6 +96,13 @@ export class PeerDiscoveryDns
       if (!this._started) return;
       const peerInfos = multiaddrsToPeerInfo(peer.getFullMultiaddrs());
       peerInfos.forEach(async (peerInfo) => {
+        if (
+          (await this._components.peerStore.getTags(peerInfo.id)).find(
+            ({ name }) => name === DEFAULT_BOOTSTRAP_TAG_NAME
+          )
+        )
+          return;
+
         await this._components.peerStore.tagPeer(
           peerInfo.id,
           DEFAULT_BOOTSTRAP_TAG_NAME,
diff --git a/packages/peer-exchange/src/waku_peer_exchange_discovery.ts b/packages/peer-exchange/src/waku_peer_exchange_discovery.ts
index 9fc63e5793..72b1a3a241 100644
--- a/packages/peer-exchange/src/waku_peer_exchange_discovery.ts
+++ b/packages/peer-exchange/src/waku_peer_exchange_discovery.ts
@@ -170,8 +170,6 @@ export class PeerExchangeDiscovery
 
           if (!peerId || !multiaddrs || multiaddrs.length === 0) continue;
 
-          if (await this.components.peerStore.has(peerId)) continue;
-
           if (
             (await this.components.peerStore.getTags(peerId)).find(
               ({ name }) => name === DEFAULT_PEER_EXCHANGE_TAG_NAME