diff --git a/projects/core/koin-core-viewmodel-navigation/src/commonMain/kotlin/org/koin/viewmodel/CreationNavExtrasExt.kt b/projects/core/koin-core-viewmodel-navigation/src/commonMain/kotlin/org/koin/viewmodel/CreationNavExtrasExt.kt
index 73e211d9c..87dd82cf0 100644
--- a/projects/core/koin-core-viewmodel-navigation/src/commonMain/kotlin/org/koin/viewmodel/CreationNavExtrasExt.kt
+++ b/projects/core/koin-core-viewmodel-navigation/src/commonMain/kotlin/org/koin/viewmodel/CreationNavExtrasExt.kt
@@ -8,7 +8,7 @@ import org.koin.core.annotation.KoinInternalApi
 
 @OptIn(KoinInternalApi::class)
 fun defaultNavExtras(viewModelStoreOwner: ViewModelStoreOwner): CreationExtras = when {
-    viewModelStoreOwner is NavBackStackEntry && viewModelStoreOwner.arguments != null -> viewModelStoreOwner.arguments?.toExtras(viewModelStoreOwner) ?: CreationExtras.Empty
+    viewModelStoreOwner is NavBackStackEntry -> viewModelStoreOwner.defaultViewModelCreationExtras
     viewModelStoreOwner is HasDefaultViewModelProviderFactory -> viewModelStoreOwner.defaultViewModelCreationExtras
     else -> CreationExtras.Empty
 }
\ No newline at end of file