diff --git a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareConnectionTracker.kt b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareConnectionTracker.kt
index a44439b7..b9964472 100644
--- a/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareConnectionTracker.kt
+++ b/app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareConnectionTracker.kt
@@ -72,9 +72,8 @@ class WifiAwareConnectionTracker(
      */
     override fun stop() {
         super.stop()
-        peerSockets.keys.toList().forEach { disconnect(it) }
-        serverSockets.keys.toList().forEach { disconnect(it) }
-        // (disconnect handles map removal)
+        val allIds = peerSockets.keys + serverSockets.keys + networkCallbacks.keys
+        allIds.toSet().forEach { disconnect(it) }
     }
     
     fun getDebugInfo(): String {