diff --git a/protocol/signed_handshake_done.go b/protocol/signed_handshake_done.go
index 329a4b5..6d4d004 100644
--- a/protocol/signed_handshake_done.go
+++ b/protocol/signed_handshake_done.go
@@ -112,6 +112,10 @@ func (h HandshakeDone) HandleMessage(message IncomingMessageDataSigned) error {
 		return err
 	}
 
+	if len(h.connectionUris) == 0 {
+		return nil
+	}
+
 	peer.SetConnectionURIs(h.connectionUris)
 
 	peerId, err := peer.Id().ToString()