diff --git a/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt b/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt
index e379f19..db3c238 100644
--- a/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt
+++ b/app/src/androidMain/kotlin/com/aerotoss/discovery/CompositeAndroidDiscovery.kt
@@ -36,8 +36,9 @@ class CompositeAndroidDiscovery(
                 wifiDirectManager.devices
             ) { tcpDevices, wifiDirectDevices ->
                 val all = mutableMapOf<String, Device>()
-                tcpDevices.forEach { all["tcp:${it.id}"] = it }
-                wifiDirectDevices.forEach { all["wifi:${it.id}"] = it }
+                // Use device ID as key for both sources - deduplicates automatically
+                tcpDevices.forEach { all[it.id] = it }
+                wifiDirectDevices.forEach { all[it.id] = it }
                 all.values.toList()
             }.collect { _devices.value = it }
         }