diff --git a/navigation/src/androidMain/kotlin/com/freeletics/khonshu/navigation/internal/StackSnapshot.kt b/navigation/src/androidMain/kotlin/com/freeletics/khonshu/navigation/internal/StackSnapshot.kt
index 5876c30cb..7d4c7b4e5 100644
--- a/navigation/src/androidMain/kotlin/com/freeletics/khonshu/navigation/internal/StackSnapshot.kt
+++ b/navigation/src/androidMain/kotlin/com/freeletics/khonshu/navigation/internal/StackSnapshot.kt
@@ -48,6 +48,7 @@ public class StackSnapshot internal constructor(
     @InternalNavigationCodegenApi
     public fun <T : BaseRoute> entryFor(destinationId: DestinationId<T>): StackEntry<T> {
         return entries.lastOrNull { it.destinationId == destinationId } as StackEntry<T>?
+            ?: startStackRootEntry.takeIf { it.destinationId == destinationId } as StackEntry<T>?
             ?: throw IllegalStateException("Route $destinationId not found on back stack")
     }
 }