diff --git a/ElementX/Sources/Screens/CreateRoomScreen/CreateRoomScreenViewModel.swift b/ElementX/Sources/Screens/CreateRoomScreen/CreateRoomScreenViewModel.swift
index 695f16a5c..46f49c541 100644
--- a/ElementX/Sources/Screens/CreateRoomScreen/CreateRoomScreenViewModel.swift
+++ b/ElementX/Sources/Screens/CreateRoomScreen/CreateRoomScreenViewModel.swift
@@ -61,7 +61,6 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
                                                                isKnockingFeatureEnabled: appSettings.knockingEnabled,
                                                                canSelectSpace: canSelectSpace,
                                                                aliasLocalPart: roomAliasNameFromRoomDisplayName(roomName: ""),
-                                                               topLevelSpaces: canSelectSpace ? userSession.clientProxy.spaceService.topLevelSpacesPublisher.value : [],
                                                                bindings: bindings),
                    mediaProvider: userSession.mediaProvider)
         
@@ -201,15 +200,6 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
                 }
             }
             .store(in: &cancellables)
-        
-        if state.canSelectSpace {
-            userSession
-                .clientProxy
-                .spaceService
-                .topLevelSpacesPublisher
-                .weakAssign(to: \.state.topLevelSpaces, on: self)
-                .store(in: &cancellables)
-        }
     }
     
     private func createRoom() async {
diff --git a/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift b/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
index 0fde5b02f..9c2912a89 100644
--- a/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
+++ b/ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift
@@ -98,7 +98,7 @@ class SpaceServiceProxy: SpaceServiceProxyProtocol {
             return .failure(.sdkError(error))
         }
     }
-    
+        
     // MARK: - Private
     
     private func handleSpaceListUpdates(_ updates: [SpaceListUpdate]) {