diff --git a/ElementX/Sources/Screens/Spaces/SpaceAddRoomsScreen/SpaceAddRoomsScreenViewModel.swift b/ElementX/Sources/Screens/Spaces/SpaceAddRoomsScreen/SpaceAddRoomsScreenViewModel.swift
index b8fefaf40..7c998d69a 100644
--- a/ElementX/Sources/Screens/Spaces/SpaceAddRoomsScreen/SpaceAddRoomsScreenViewModel.swift
+++ b/ElementX/Sources/Screens/Spaces/SpaceAddRoomsScreen/SpaceAddRoomsScreenViewModel.swift
@@ -49,7 +49,10 @@ class SpaceAddRoomsScreenViewModel: SpaceAddRoomsScreenViewModelType, SpaceAddRo
             let existingRooms = spaceRoomListProxy.spaceRoomsPublisher.value
             suggestedRooms = await userSession.clientProxy
                 .recentlyVisitedRooms { roomProxy in
-                    !roomProxy.infoPublisher.value.isDirect && !existingRooms.contains { $0.id == roomProxy.id }
+                    !roomProxy.infoPublisher.value.isDirect
+                        && !roomProxy.infoPublisher.value.isSpace
+                        && roomProxy.infoPublisher.value.membership == .joined
+                        && !existingRooms.contains { $0.id == roomProxy.id }
                 }
                 .map { .init(roomProxy: $0) }
             
diff --git a/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift b/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
index 1c77b1a11..2fb0cbb3f 100644
--- a/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
+++ b/ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
@@ -138,8 +138,10 @@ struct SpaceScreen: View {
                             }
                             .accessibilityIdentifier(A11yIdentifiers.spaceScreen.addExistingRooms)
                             
-                            Button { context.send(viewAction: .manageChildren) } label: {
-                                Label(L10n.actionManageRooms, icon: \.edit)
+                            if context.viewState.rooms.count > 0 {
+                                Button { context.send(viewAction: .manageChildren) } label: {
+                                    Label(L10n.actionManageRooms, icon: \.edit)
+                                }
                             }
                         }
                     }