diff --git a/client/internal/peer/conn.go b/client/internal/peer/conn.go
index 56b772759a2..84a8c221fa6 100644
--- a/client/internal/peer/conn.go
+++ b/client/internal/peer/conn.go
@@ -309,6 +309,11 @@ func (conn *Conn) iCEConnectionIsReady(priority ConnPriority, iceConnInfo ICECon
 		return
 	}
 
+	if remoteConnNil(conn.log, iceConnInfo.RemoteConn) {
+		conn.log.Errorf("remote ICE connection is nil")
+		return
+	}
+
 	conn.log.Debugf("ICE connection is ready")
 
 	if conn.currentConnPriority > priority {
diff --git a/client/internal/peer/nilcheck.go b/client/internal/peer/nilcheck.go
new file mode 100644
index 00000000000..058fe9a2697
--- /dev/null
+++ b/client/internal/peer/nilcheck.go
@@ -0,0 +1,21 @@
+package peer
+
+import (
+	"net"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func remoteConnNil(log *log.Entry, conn net.Conn) bool {
+	if conn == nil {
+		log.Errorf("ice conn is nil")
+		return true
+	}
+
+	if conn.RemoteAddr() == nil {
+		log.Errorf("ICE remote address is nil")
+		return true
+	}
+
+	return false
+}