diff --git a/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt b/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt
index d65fdcf..0f9b054 100644
--- a/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt
+++ b/app/src/commonMain/kotlin/com/aerotoss/discovery/TcpDiscovery.kt
@@ -147,6 +147,9 @@ class TcpDiscovery(
             if (remoteId == deviceId) return
             if (remoteServicePort == myServicePort) return
 
+            // Skip if already known
+            if (discoveredDevices.containsKey(remoteId)) return
+
             val host = pkt.address.hostAddress ?: return
             val device = queryRemote(host, remoteTcpPort)
             if (device != null) {