diff --git a/internal/p2p/peermanager.go b/internal/p2p/peermanager.go
index 8a588cfec..3ab6fbdc2 100644
--- a/internal/p2p/peermanager.go
+++ b/internal/p2p/peermanager.go
@@ -877,6 +877,10 @@ func (m *PeerManager) Advertise(peerID types.NodeID, limit uint16) []NodeAddress
 		addresses[i], addresses[j] = addresses[j], addresses[i]
 	})
 
+	if len(addresses) <= int(limit) {
+		return addresses
+	}
+
 	return addresses[:limit-1]
 }