diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index c3f67871654..36bb23bd4bc 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -6,7 +6,10 @@
 
 - Move from `open-metrics-client` to `prometheus-client` (see [PR 2442]).
 
+- Emit gossip of all non empty topics (see [PR 2481]).
+
 [PR 2442]: https://github.com/libp2p/rust-libp2p/pull/2442
+[PR 2481]: https://github.com/libp2p/rust-libp2p/pull/2481
 
 # 0.35.0 [2022-01-27]
 
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
index 41f25ed3be0..489f916910c 100644
--- a/protocols/gossipsub/src/behaviour.rs
+++ b/protocols/gossipsub/src/behaviour.rs
@@ -2508,7 +2508,7 @@ where
         for (topic_hash, peers) in self.mesh.iter().chain(self.fanout.iter()) {
             let mut message_ids = self.mcache.get_gossip_message_ids(topic_hash);
             if message_ids.is_empty() {
-                return;
+                continue;
             }
 
             // if we are emitting more than GossipSubMaxIHaveLength message_ids, truncate the list