diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt
index f26f8d15..6f4df4fc 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt
@@ -61,7 +61,9 @@ fun ClawNavigationBar(
               navItem.listStateResetCallback()
               return@NavigationBarItem
             }
-            navController.popBackStack(navController.graph.startDestinationRoute!!, false)
+            navController.graph.startDestinationRoute?.let { startDestination ->
+              navController.popBackStack(startDestination, false)
+            }
             if (navItem.route != Destinations.startDestination.route) {
               navController.navigate(navItem.route)
             }