diff --git a/lib/controllers/spaces.dart b/lib/controllers/spaces.dart
index 0dae863..8af045c 100644
--- a/lib/controllers/spaces.dart
+++ b/lib/controllers/spaces.dart
@@ -77,7 +77,10 @@ class SpacesController extends AsyncNotifier<IList<Space>> {
       );
     }
 
-    final spaces = topLevelSpaceIds.map(buildSpace).toIList();
+    final spaces = topLevelSpaceIds
+        .where(rooms.containsKey)
+        .map(buildSpace)
+        .toIList();
 
     final usedRooms = spaces
         .expand(