diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
index bf71a6731e..e3698aacb2 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
@@ -177,6 +177,7 @@ class SpaceFlowNode(
                         // Reset the room list in the space so this new room is displayed
                         lifecycleScope.launch { spaceRoomList.reset() }
                         callback.navigateToRoom(roomId, emptyList())
+                        backstack.pop()
                     }
                 }
                 createRoomEntryPoint