diff --git a/lib/controllers/spaces_controller.dart b/lib/controllers/spaces_controller.dart
index 292e323..646f48d 100644
--- a/lib/controllers/spaces_controller.dart
+++ b/lib/controllers/spaces_controller.dart
@@ -40,8 +40,11 @@ class SpacesController extends Notifier<IList<Space>> {
     final allNestedRoomIds = childRoomsBySpaceId.values
         .expand((l) => l)
         .map(
-          (room) =>
-              rooms.entries.firstWhere((entry) => entry.value == room).key,
+          (room) => rooms.entries
+              .firstWhere(
+                (entry) => entry.value.metadata?.id == room.metadata?.id,
+              )
+              .key,
         )
         .toISet();