diff --git a/package.json b/package.json
index 5fd3acc..551a36e 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
   },
   "homepage": "https://github.com/libp2p/js-libp2p-mdns",
   "devDependencies": {
-    "aegir": "^21.0.2",
+    "aegir": "^25.0.0",
     "chai": "^4.2.0",
     "delay": "^4.3.0",
     "dirty-chai": "^2.0.1",
@@ -44,9 +44,9 @@
   },
   "dependencies": {
     "debug": "^4.1.1",
-    "multiaddr": "^7.1.0",
+    "multiaddr": "^7.5.0",
     "multicast-dns": "^7.2.0",
-    "peer-id": "~0.13.3"
+    "peer-id": "^0.13.13"
   },
   "contributors": [
     "David Dias <daviddias.p@gmail.com>",
diff --git a/src/compat/responder.js b/src/compat/responder.js
index edd7c52..bcaa295 100644
--- a/src/compat/responder.js
+++ b/src/compat/responder.js
@@ -23,7 +23,13 @@ class Responder {
   }
 
   _onQuery (event, info) {
-    const addresses = this._multiaddrs.map(ma => ma.toOptions())
+    const addresses = this._multiaddrs.reduce((acc, addr) => {
+      if (addr.isThinWaistAddress()) {
+        acc.push(addr.toOptions())
+      }
+      return acc
+    }, [])
+
     // Only announce TCP for now
     if (!addresses.length) return
 
diff --git a/src/query.js b/src/query.js
index 49f39f7..5b2c408 100644
--- a/src/query.js
+++ b/src/query.js
@@ -86,7 +86,13 @@ module.exports = {
   gotQuery: function (qry, mdns, peerId, multiaddrs, serviceTag, broadcast) {
     if (!broadcast) { return }
 
-    const addresses = multiaddrs.map(ma => ma.toOptions())
+    const addresses = multiaddrs.reduce((acc, addr) => {
+      if (addr.isThinWaistAddress()) {
+        acc.push(addr.toOptions())
+      }
+      return acc
+    }, [])
+
     // Only announce TCP for now
     if (addresses.length === 0) { return }
 
diff --git a/test/multicast-dns.spec.js b/test/multicast-dns.spec.js
index 795b77e..4b4dd51 100644
--- a/test/multicast-dns.spec.js
+++ b/test/multicast-dns.spec.js
@@ -28,17 +28,21 @@ describe('MulticastDNS', () => {
     ])
 
     aMultiaddrs = [
-      multiaddr('/ip4/127.0.0.1/tcp/20001')
+      multiaddr('/ip4/127.0.0.1/tcp/20001'),
+      multiaddr('/dns4/webrtc-star.discovery.libp2p.io/tcp/443/wss/p2p-webrtc-star'),
+      multiaddr('/dns4/discovery.libp2p.io/tcp/8443')
     ]
 
     bMultiaddrs = [
       multiaddr('/ip4/127.0.0.1/tcp/20002'),
-      multiaddr('/ip6/::1/tcp/20002')
+      multiaddr('/ip6/::1/tcp/20002'),
+      multiaddr('/dnsaddr/discovery.libp2p.io')
     ]
 
     cMultiaddrs = [
       multiaddr('/ip4/127.0.0.1/tcp/20003'),
-      multiaddr('/ip4/127.0.0.1/tcp/30003/ws')
+      multiaddr('/ip4/127.0.0.1/tcp/30003/ws'),
+      multiaddr('/dns4/discovery.libp2p.io')
     ]
 
     dMultiaddrs = [