diff --git a/waku/v2/peermanager/peer_selection.go b/waku/v2/peermanager/peer_selection.go
index 5f41e6b5..82b0a9f7 100644
--- a/waku/v2/peermanager/peer_selection.go
+++ b/waku/v2/peermanager/peer_selection.go
@@ -73,7 +73,10 @@ func (pm *PeerManager) SelectRandom(criteria PeerSelectionCriteria) (peer.IDSlic
 	if err != nil {
 		return nil, err
 	}
-	if len(criteria.PubsubTopics) > 0 && len(filteredPeers) > 0 {
+	if len(filteredPeers) == 0 {
+		return nil, utils.ErrNoPeersAvailable
+	}
+	if len(criteria.PubsubTopics) > 0 {
 		filteredPeers = pm.host.Peerstore().(wps.WakuPeerstore).PeersByPubSubTopics(criteria.PubsubTopics, filteredPeers...)
 	}
 	//Not passing excludePeers as filterPeers are already considering excluded ones.