diff --git a/waku/v2/protocol/filter/subscriptions_map.go b/waku/v2/protocol/filter/subscriptions_map.go
index 66d1e1669..5272fa9b9 100644
--- a/waku/v2/protocol/filter/subscriptions_map.go
+++ b/waku/v2/protocol/filter/subscriptions_map.go
@@ -225,7 +225,7 @@ func iterateSubscriptionSet(logger *zap.Logger, subscriptions SubscriptionSet, e
 			defer subscription.RUnlock()
 
 			_, ok := subscription.ContentTopics[envelope.Message().ContentTopic]
-			if !ok && len(subscription.ContentTopics) != 0 {
+			if !ok { // only send the msg to subscriptions that have matching contentTopic
 				return
 			}