diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 20808b8396..8e0a528fca 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -27,7 +27,6 @@ import com.arkivanov.essenty.lifecycle.asEssentyLifecycle
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.AppRouter
 import com.tangem.common.routing.entity.SerializableIntent
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.decompose.context.AppComponentContext
@@ -181,9 +180,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     @Inject
     internal lateinit var routingComponentFactory: RoutingComponent.Factory
 
-    @Inject
-    internal lateinit var appRouter: AppRouter
-
     @Inject
     lateinit var pushNotificationsRouter: PushNotificationsRouter
 
@@ -512,7 +508,9 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     }
 
     private fun navigateToInitialScreenIfNeeded(intentWhichStartedActivity: Intent?) {
-        val backStack = appRouter.stack
+        val backStack = appRouterConfig.stack ?: emptyList()
+        // TODO move inital navigation to navigation component ([REDACTED_JIRA])
+        val isOnlyInitialRoute = backStack.all { it is AppRoute.Initial }
         val isOnInitialScreen = backStack.all { it is AppRoute.Welcome || it is AppRoute.Home }
         val isNotScannedBefore = store.state.globalState.scanResponse == null
         val isOnboardingServiceNotActive = !store.state.globalState.onboardingState.onboardingStarted
@@ -524,6 +522,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
             backStack.isEmpty() -> {
                 navigateToInitialScreen(intentWhichStartedActivity)
             }
+            isOnlyInitialRoute -> navigateToInitialScreen(intentWhichStartedActivity)
             else -> Unit
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt b/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt
index e766371cb7..c3cd524d98 100644
--- a/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt
+++ b/app/src/main/java/com/tangem/tap/routing/impl/DefaultRoutingComponent.kt
@@ -44,7 +44,7 @@ internal class DefaultRoutingComponent @AssistedInject constructor(
     private fun getInitialRoute(): AppRoute = AppRoute.Initial
 
     private fun child(route: AppRoute, context: ComponentContext): Child {
-        return childFactory.createChild(route, { childByContext(context) })
+        return childFactory.createChild(route) { childByContext(context) }
     }
 
     @AssistedFactory
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 934dbe9b97..599c51622e 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -88,7 +88,7 @@ markdown = "0.7.2"
 # endregion Other libraries
 
 # region Tangem
-tangemBlockchainSdk = "release-app_5.13-718"
+tangemBlockchainSdk = "release-app_5.13-730"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
 tangemCardSdk = "release-app_5.13-376"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^