diff --git a/ElementX/Sources/Services/UserSession/UserSessionFlowCoordinator.swift b/ElementX/Sources/Services/UserSession/UserSessionFlowCoordinator.swift
index 091132da3..c584ccbcb 100644
--- a/ElementX/Sources/Services/UserSession/UserSessionFlowCoordinator.swift
+++ b/ElementX/Sources/Services/UserSession/UserSessionFlowCoordinator.swift
@@ -186,6 +186,7 @@ class UserSessionFlowCoordinator: CoordinatorProtocol {
         Task { @MainActor in
             guard let roomProxy = await userSession.clientProxy.roomForIdentifier(roomIdentifier) else {
                 MXLog.error("Invalid room identifier: \(roomIdentifier)")
+                stateMachine.processEvent(.deselectRoom)
                 return
             }
             let userId = userSession.clientProxy.userID