diff --git a/waku/v2/peerstore/waku_peer_store.go b/waku/v2/peerstore/waku_peer_store.go
index 5d0dfd2a..00c812c5 100644
--- a/waku/v2/peerstore/waku_peer_store.go
+++ b/waku/v2/peerstore/waku_peer_store.go
@@ -165,6 +165,11 @@ func (ps *WakuPeerstoreImpl) RemovePubSubTopic(p peer.ID, topic string) error {
 	if err != nil {
 		return err
 	}
+
+	if len(existingTopics) == 0 {
+		return nil
+	}
+
 	for i := range existingTopics {
 		existingTopics = append(existingTopics[:i], existingTopics[i+1:]...)
 	}