diff --git a/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift b/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift
index 370e93415..0bd6739b1 100644
--- a/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift
+++ b/ElementX/Sources/Mocks/RoomPreviewProxyMock.swift
@@ -100,7 +100,7 @@ extension RoomPreviewProxyMock {
     convenience init(spaceRoomProxy: SpaceRoomProxyProtocol) {
         self.init(Configuration(roomID: spaceRoomProxy.id,
                                 canonicalAlias: spaceRoomProxy.canonicalAlias ?? "",
-                                name: spaceRoomProxy.name ?? "",
+                                name: spaceRoomProxy.name,
                                 topic: spaceRoomProxy.topic ?? "",
                                 avatarURL: spaceRoomProxy.avatarURL?.absoluteString ?? "",
                                 numJoinedMembers: UInt64(spaceRoomProxy.joinedMembersCount),
diff --git a/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift b/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift
index 6b5a2767d..0e358602a 100644
--- a/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift
+++ b/ElementX/Sources/Screens/JoinRoomScreen/JoinRoomScreenViewModel.swift
@@ -116,7 +116,7 @@ class JoinRoomScreenViewModel: JoinRoomScreenViewModelType, JoinRoomScreenViewMo
                                                  primaryButton: .init(title: L10n.actionTryAgain) { [weak self] in Task { await self?.loadRoomDetails() }},
                                                  secondaryButton: .init(title: L10n.actionCancel, role: .cancel) { [weak self] in self?.actionsSubject.send(.dismiss) })
             }
-        case .space(let spaceRoomProxyProtocol):
+        case .space:
             isLoadingPreview = false
         }
         
diff --git a/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift b/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
index b7df75986..53919f054 100644
--- a/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
+++ b/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
@@ -73,7 +73,7 @@ struct SpaceRoomCell: View {
             .accessibilityElement(children: .combine)
         }
         .buttonStyle(SpaceRoomCellButtonStyle(isSelected: isSelected))
-        .accessibilityIdentifier(A11yIdentifiers.spaceListScreen.spaceRoomName(spaceRoomProxy.name ?? spaceRoomProxy.id))
+        .accessibilityIdentifier(A11yIdentifiers.spaceListScreen.spaceRoomName(spaceRoomProxy.name))
     }
     
     @ViewBuilder @MainActor