diff --git a/client/internal/peer/status.go b/client/internal/peer/status.go
index 2b311ff09..6e436ba6e 100644
--- a/client/internal/peer/status.go
+++ b/client/internal/peer/status.go
@@ -146,6 +146,11 @@ func (d *Status) UpdatePeerState(receivedState State) error {
 
 	d.peers[receivedState.PubKey] = peerState
 
+	if receivedState.ConnStatus == StatusConnecting ||
+		(receivedState.ConnStatus == StatusDisconnected && peerState.ConnStatus == StatusConnecting) {
+		return nil
+	}
+
 	ch, found := d.changeNotify[receivedState.PubKey]
 	if found && ch != nil {
 		close(ch)