diff --git a/app/src/bridge/index.ts b/app/src/bridge/index.ts
index 9369d77..8f81189 100755
--- a/app/src/bridge/index.ts
+++ b/app/src/bridge/index.ts
@@ -85,7 +85,10 @@ messaging.on("message", (message: Message) => {
                     });
 
                     if (shouldWatchStatus) {
-                        remotes.get(deviceId)?.disconnect();
+                        if (remotes.has(deviceId)) {
+                            remotes.get(deviceId)?.disconnect();
+                            remotes.delete(deviceId);
+                        }
                     }
                 }
             });