diff --git a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
index 90d6b880da..c8457793e5 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
@@ -32,10 +32,8 @@ val navigationMiddleware: Middleware<AppState> = { _, state ->
                             AppScreen.Home,
                             AppScreen.Welcome,
                             -> {
-                                navState?.activity?.get()?.popBackTo(screen, action.inclusive)
-                                if (navState?.backStack?.contains(screen) != true) {
-                                    store.dispatchOnMain(NavigationAction.NavigateTo(screen))
-                                }
+                                navState?.activity?.get()?.popBackTo(screen, inclusive = true)
+                                store.dispatchOnMain(NavigationAction.NavigateTo(screen))
                             }
                             else -> {
                                 navState?.activity?.get()?.popBackTo(screen, action.inclusive)
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
index 8f4282fed9..c879e6ca04 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -93,9 +93,14 @@ private fun readCard() = scope.launch {
                     userWalletsListManager.save(userWallet)
                         .doOnFailure { error ->
                             Timber.e(error, "Unable to save user wallet")
+                            tangemSdkManager.setAccessCodeRequestPolicy(useBiometricsForAccessCode = false)
                             store.onCardScanned(scanResponse)
                         }
                         .doOnSuccess {
+                            tangemSdkManager.setAccessCodeRequestPolicy(
+                                useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes &&
+                                    userWallet.hasAccessCode,
+                            )
                             store.onUserWalletSelected(userWallet)
                         }
                         .doOnResult {