diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt
index dc435cce..3ee631a9 100644
--- a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt
+++ b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt
@@ -87,16 +87,6 @@ fun AddMemberToChatRoomConfirmationScreen(
             }
         }
         is AddMemberToChatRoomConfirmationUIState.Loaded -> {
-            val textFieldState = rememberTextFieldState()
-
-            val chatRoomDetailMessageListViewModel: at.torch.compose.ui.view.model.ChatRoomDetailMessageListViewModel = viewModel(
-                factory = at.torch.compose.ui.view.model.ChatRoomDetailMessageListViewModel.factory(
-                    localChatRoom = addMemberToChatRoomConfirmationUIState.localChatRoom,
-                    nostrRepository = nostrRepository,
-                    chatRepository = chatRepository
-                )
-            )
-
             Scaffold(
                 topBar = {
                     TopAppBar(
@@ -119,16 +109,12 @@ fun AddMemberToChatRoomConfirmationScreen(
                     modifier = Modifier.padding(innerPadding).fillMaxSize()
                 ) {
                     Column(
-                        modifier = Modifier.weight(1f).fillMaxWidth()
+                        modifier = Modifier.weight(1f).fillMaxWidth(),
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.spacedBy(10.dp)
                     ) {
-                        Text("Render contact List")
+                        Text("Render confirmation")
                     }
-
-                    key(true) {
-                        chatRoomDetailMessageListViewModel.initiate()
-                    }
-
-                    // TODO: Check that we have direct message relays for this user...
                 }
             }
         }
diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt
index b7339326..27c86a6d 100644
--- a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt
+++ b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt
@@ -95,16 +95,6 @@ fun SearchMemberToAddToChatRoomScreen(
             }
         }
         is SearchMemberToAddToChatRoomUIState.Loaded -> {
-            val textFieldState = rememberTextFieldState()
-
-            val chatRoomDetailMessageListViewModel: ChatRoomDetailMessageListViewModel = viewModel(
-                factory = ChatRoomDetailMessageListViewModel.factory(
-                    localChatRoom = searchMemberToAddToChatRoomUIState.localChatRoom,
-                    nostrRepository = nostrRepository,
-                    chatRepository = chatRepository
-                )
-            )
-
             Scaffold(
                 topBar = {
                     TopAppBar(
@@ -192,10 +182,6 @@ fun SearchMemberToAddToChatRoomScreen(
                             }
                         }
                     }
-
-                    key(true) {
-                        chatRoomDetailMessageListViewModel.initiate()
-                    }
                 }
             }
         }
diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/navigation/TorchNavHost.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/navigation/TorchNavHost.kt
index e855b136..3c2320c9 100644
--- a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/navigation/TorchNavHost.kt
+++ b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/navigation/TorchNavHost.kt
@@ -586,11 +586,7 @@ fun TorchNavHost(
                 onNavigateToRoute = { chatRoomDetailRoute ->
                     navController.navigate(
                         route = chatRoomDetailRoute
-                    ) {
-                        popUpTo(route) {
-                            inclusive = true
-                        }
-                    }
+                    )
                 },
             )
         }