diff --git a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
index ea3b02d1..c0584c65 100644
--- a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
+++ b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs
@@ -512,6 +512,12 @@ namespace PepperDash.Essentials
             {
                 simplMessenger.ConfigurationIsReady += Bridge_ConfigurationIsReady;
             }
+
+            if (messenger is MobileControlBridgeBase roomBridge)
+            {
+                _roomBridges.Add(roomBridge);
+            }
+
             this.LogVerbose(
                 "Adding default messenger with key {messengerKey} for path {messengerPath}",
                 messenger.Key,
diff --git a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
index 0f03f2a9..ba6a94fb 100644
--- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
+++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
@@ -356,11 +356,10 @@ namespace PepperDash.Essentials.WebSocketServer
             foreach (var client in touchpanelsToAdd)
             {
                 var bridge = _parent.GetRoomBridge(client.DefaultRoomKey);
-
                 if (bridge == null)
                 {
                     this.LogWarning("Unable to find room with key: {defaultRoomKey}", client.DefaultRoomKey);
-                    return;
+                    continue;
                 }
 
                 var (key, path) = GenerateClientToken(bridge, client.Key);