diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
index ad4c7597c9..2267ab620b 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
@@ -143,10 +143,6 @@ internal class BiometricUserWalletsListManager(
     }
 
     override suspend fun delete(walletIds: List<UserWalletId>): CompletionResult<Unit> {
-        if (state.value.isLocked) {
-            return CompletionResult.Success(Unit)
-        }
-
         val walletIdsToRemove = state.value.wallets
             .map { it.walletId }
             .filter { it in walletIds }
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
index fb671a9cbc..829103e4e7 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@@ -121,8 +121,12 @@ class DetailsMiddleware {
 
                                 val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
                                 if (selectedUserWallet != null) {
-                                    store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
-                                    store.onUserWalletSelected(selectedUserWallet)
+                                    if (userWalletsListManager.isLockedSync) {
+                                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Welcome))
+                                    } else {
+                                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                                        store.onUserWalletSelected(selectedUserWallet)
+                                    }
                                 } else {
                                     userWalletsListManager.lock()
                                     store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
index 11508acf00..fb5b8a626d 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -78,14 +78,12 @@ internal class WelcomeMiddleware {
         scanCardInternal { scanResponse ->
             val userWallet = UserWalletBuilder(scanResponse).build()
 
+            tangemSdkManager.setAccessCodeRequestPolicy(useBiometricsForAccessCode = false)
             userWalletsListManager.unlockWithCard(userWallet)
                 .doOnFailure { error ->
                     store.dispatchOnMain(WelcomeAction.ProceedWithCard.Error(error))
                 }
                 .doOnSuccess {
-                    tangemSdkManager.setAccessCodeRequestPolicy(
-                        useBiometricsForAccessCode = false,
-                    )
                     store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
                     store.dispatchOnMain(WelcomeAction.ProceedWithCard.Success)
                     store.onUserWalletSelected(userWallet)