diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go
index 3aa64e948f..9fa5441fa7 100644
--- a/p2p/host/basic/basic_host.go
+++ b/p2p/host/basic/basic_host.go
@@ -323,9 +323,14 @@ func sameAddrs(a, b []ma.Multiaddr) bool {
 		return false
 	}
 
-	// this is O(n*m), might be worth using a map to turn into O(n+m)
+	bmap := make(map[string]struct{})
+	for _, addr := range b {
+		bmap[string(addr.Bytes())] = struct{}{}
+	}
+
 	for _, addr := range a {
-		if !findAddr(addr, b) {
+		_, ok := bmap[string(addr.Bytes())]
+		if !ok {
 			return false
 		}
 	}
@@ -333,15 +338,6 @@ func sameAddrs(a, b []ma.Multiaddr) bool {
 	return true
 }
 
-func findAddr(addr ma.Multiaddr, addrs []ma.Multiaddr) bool {
-	for _, xaddr := range addrs {
-		if addr.Equal(xaddr) {
-			return true
-		}
-	}
-	return false
-}
-
 // ID returns the (local) peer.ID associated with this Host
 func (h *BasicHost) ID() peer.ID {
 	return h.Network().LocalPeer()