diff --git a/core/network/src/peer_manager/mod.rs b/core/network/src/peer_manager/mod.rs
index f002cb8cb..e9e28a360 100644
--- a/core/network/src/peer_manager/mod.rs
+++ b/core/network/src/peer_manager/mod.rs
@@ -784,7 +784,9 @@ impl PeerManager {
             }
         }
 
-        warn!("network: no peers {:?}", no_peers);
+        if !no_peers.is_empty() {
+            warn!("network: no peers {:?}", no_peers);
+        }
 
         // Send message to connected users
         let tar = TargetSession::Multi(connected);
@@ -921,6 +923,7 @@ impl PeerManager {
 
                 if self.bootstraps.contains(&addr) {
                     error!("network: unconnectable bootstrap address {}", addr);
+                    return;
                 }
 
                 self.inner.try_remove_addr(&addr);