diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index 4d6ac46c84..b8c969a845 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -166,8 +166,16 @@ namespace osu.Game.Screens.Multi
                 var r = listing[i];
                 r.Position.Value = i;
 
-                update(r, r);
-                addRoom(r);
+                try
+                {
+                    update(r, r);
+                    addRoom(r);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex, $"Failed to update room: {r.Name.Value}.");
+                    rooms.Remove(r);
+                }
             }
 
             RoomsUpdated?.Invoke();