diff --git a/p2p/host/relay/autorelay.go b/p2p/host/relay/autorelay.go
index 409a5e25ffd9a2ec70ba5a1155d1c8bbfead5351..18858795b670951c822efe7a58a9fbc77a14b7ae 100644
--- a/p2p/host/relay/autorelay.go
+++ b/p2p/host/relay/autorelay.go
@@ -199,12 +199,12 @@ func (h *AutoRelayHost) doUpdateAddrs() {
 		}
 	}
 
-	circuit, err := ma.NewMultiaddr("/p2p-circuit")
-	if err != nil {
-		panic(err)
-	}
-
 	for _, pi := range h.relays {
+		circuit, err := ma.NewMultiaddr(fmt.Sprintf("/ipfs/%s/p2p-circuit", pi.ID.Pretty()))
+		if err != nil {
+			panic(err)
+		}
+
 		for _, addr := range pi.Addrs {
 			if !manet.IsPrivateAddr(addr) {
 				pub := addr.Encapsulate(circuit)