diff --git a/src/net/session/mod.rs b/src/net/session/mod.rs
index 371e5c481..783ba63ce 100644
--- a/src/net/session/mod.rs
+++ b/src/net/session/mod.rs
@@ -85,7 +85,7 @@ pub async fn remove_sub_on_stop(p2p: P2pPtr, channel: ChannelPtr, type_id: Sessi
     // Remove channel from the HostRegistry. Free up this addr for any future operation.
     hosts.unregister(channel.address());
 
-    if hosts.channels().is_empty() {
+    if !p2p.is_connected() {
         hosts.disconnect_publisher.notify(Error::NetworkNotConnected).await;
     }
     debug!(target: "net::session::remove_sub_on_stop()", "[END]");