diff --git a/libnetwork/networkdb/broadcast.go b/libnetwork/networkdb/broadcast.go
index 5555634179..3fe9f6271a 100644
--- a/libnetwork/networkdb/broadcast.go
+++ b/libnetwork/networkdb/broadcast.go
@@ -86,6 +86,15 @@ func (nDB *NetworkDB) sendNodeEvent(event NodeEvent_Type) error {
 		notify: notifyCh,
 	})
 
+	nDB.RLock()
+	noPeers := len(nDB.nodes) <= 1
+	nDB.RUnlock()
+
+	// Message enqueued, do not wait for a send if no peer is present
+	if noPeers {
+		return nil
+	}
+
 	// Wait for the broadcast
 	select {
 	case <-notifyCh: