diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index fc4fcc3a7a..0890cf279c 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -366,8 +366,8 @@ class LoggedInFlowNode(
                     }
                 }
                 val spaceCallback = object : SpaceEntryPoint.Callback {
-                    override fun onOpenRoom(roomId: RoomId) {
-                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
+                    override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) {
+                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames = viaParameters))
                     }
                 }
                 val inputs = RoomFlowNode.Inputs(
diff --git a/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt b/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
index 5f7be8dba0..bdea93f3ef 100644
--- a/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
+++ b/features/space/api/src/main/kotlin/io/element/android/features/space/api/SpaceEntryPoint.kt
@@ -31,6 +31,6 @@ interface SpaceEntryPoint : FeatureEntryPoint {
     ) : NodeInputs
 
     interface Callback : Plugin {
-        fun onOpenRoom(roomId: RoomId)
+        fun onOpenRoom(roomId: RoomId, viaParameters: List<String>)
     }
 }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt
index a4828fe9fe..fa9468debe 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceNode.kt
@@ -36,8 +36,8 @@ class SpaceNode(
         SpaceView(
             state = state,
             onBackClick = ::navigateUp,
-            onRoomClick = { roomId ->
-                callback.onOpenRoom(roomId)
+            onRoomClick = { spaceRoom ->
+                callback.onOpenRoom(spaceRoom.roomId, spaceRoom.via)
             },
             modifier = modifier
         )
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt
index 53aa61a0c7..f1f8356701 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceView.kt
@@ -39,7 +39,6 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
-import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.spaces.SpaceRoom
 import io.element.android.libraries.matrix.ui.components.SpaceHeaderView
@@ -52,7 +51,7 @@ import kotlinx.collections.immutable.toImmutableList
 fun SpaceView(
     state: SpaceState,
     onBackClick: () -> Unit,
-    onRoomClick: (roomId: RoomId) -> Unit,
+    onRoomClick: (spaceRoom: SpaceRoom) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -76,7 +75,7 @@ fun SpaceView(
 @Composable
 private fun SpaceViewContent(
     state: SpaceState,
-    onRoomClick: (roomId: RoomId) -> Unit,
+    onRoomClick: (spaceRoom: SpaceRoom) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     LazyColumn(modifier.fillMaxSize()) {
@@ -102,7 +101,7 @@ private fun SpaceViewContent(
                     showUnreadIndicator = isInvitation && spaceRoom.roomId !in state.seenSpaceInvites,
                     hideAvatars = isInvitation && state.hideInvitesAvatar,
                     onClick = {
-                        onRoomClick(spaceRoom.roomId)
+                        onRoomClick(spaceRoom)
                     },
                     onLongClick = {
                         // TODO
diff --git a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt
index 465fde3425..cafc825f6a 100644
--- a/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt
+++ b/features/space/impl/src/test/kotlin/io/element/android/features/space/impl/DefaultSpaceEntryPointTest.kt
@@ -49,7 +49,7 @@ class DefaultSpaceEntryPointTest {
             )
         }
         val callback = object : SpaceEntryPoint.Callback {
-            override fun onOpenRoom(roomId: RoomId) {
+            override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) {
                 lambdaError()
             }
         }