diff --git a/app/src/main/java/com/m57/hermescontrol/Navigation.kt b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
index 0557a31d..f380942f 100644
--- a/app/src/main/java/com/m57/hermescontrol/Navigation.kt
+++ b/app/src/main/java/com/m57/hermescontrol/Navigation.kt
@@ -111,13 +111,7 @@ fun MainNavigation(sessionId: String? = null) {
     val hasToken = !token.isNullOrBlank()
     val startScreen: NavKey = if (hasToken) ChatScreen else LandingScreen
 
-    val backStack = remember { NavBackStack(startScreen) }
-    LaunchedEffect(startScreen) {
-        if (backStack.lastOrNull() != startScreen) {
-            backStack.clear()
-            backStack.add(startScreen)
-        }
-    }
+    val backStack = remember(startScreen) { NavBackStack(startScreen) }
     NavigationController.backStack = backStack
 
     val currentScreen = backStack.lastOrNull() ?: startScreen