diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
index 53cd284846..59336d8989 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
@@ -1,18 +1,16 @@
 package com.tangem.tap.features.walletSelector.redux
 
-import com.tangem.common.CompletionResult
+import com.tangem.common.*
 import com.tangem.common.core.TangemSdkError
-import com.tangem.common.doOnFailure
-import com.tangem.common.doOnSuccess
-import com.tangem.common.flatMap
-import com.tangem.common.map
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.util.UserWalletId
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.common.analytics.events.MyWallets
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.navigation.AppScreen
@@ -25,14 +23,6 @@ import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
 import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.domain.userWalletList.unlockIfLockable
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.message.SaltPayActivationError
-import com.tangem.tap.preferencesStorage
-import com.tangem.tap.scope
-import com.tangem.tap.store
-import com.tangem.tap.tangemSdkManager
-import com.tangem.tap.totalFiatBalanceCalculator
-import com.tangem.tap.userTokensRepository
-import com.tangem.tap.userWalletsListManager
-import com.tangem.tap.walletStoresManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.firstOrNull
@@ -81,11 +71,8 @@ internal class WalletSelectorMiddleware {
             is WalletSelectorAction.ChangeAppCurrency -> {
                 refreshUserWalletsAmounts()
             }
-            is WalletSelectorAction.ClearUserWallets -> scope.launch {
-                clearUserWallets()
-                    .doOnFailure { e ->
-                        Timber.e(e, "Unable to clear user wallets")
-                    }
+            is WalletSelectorAction.ClearUserWallets -> {
+                disableUserWalletsSaving()
             }
             is WalletSelectorAction.AddWallet.Success,
             is WalletSelectorAction.AddWallet.Error,
@@ -272,7 +259,7 @@ internal class WalletSelectorMiddleware {
 
         scope.launch {
             when (userWalletsIds.size) {
-                state.wallets.size -> clearUserWallets()
+                state.wallets.size -> clearUserWalletsAndPopBackToHomeScreen()
                 else -> deleteUserWallets(
                     userWalletsIds = userWalletsIds,
                     currentSelectedWalletId = state.selectedWalletId,
@@ -318,16 +305,37 @@ internal class WalletSelectorMiddleware {
         }
     }
 
+    private fun disableUserWalletsSaving() = scope.launch {
+        clearUserWallets()
+            .map {
+                preferencesStorage.shouldSaveUserWallets = false
+                preferencesStorage.shouldSaveAccessCodes = false
+            }
+            .doOnSuccess {
+                store.dispatchWithMain(WalletSelectorAction.CloseError)
+                popBackToHome()
+            }
+            .doOnFailure { e ->
+                Timber.e(e, "Unable to clear user wallets")
+            }
+    }
+
+    private suspend fun clearUserWalletsAndPopBackToHomeScreen(): CompletionResult<Unit> {
+        return clearUserWallets()
+            .doOnSuccess { popBackToHome() }
+    }
+
     private suspend fun clearUserWallets(): CompletionResult<Unit> {
         return userWalletsListManager.clear()
             .flatMap { walletStoresManager.clear() }
             .flatMap { tangemSdkManager.clearSavedUserCodes() }
-            .doOnSuccess {
-                // !!! Workaround !!!
-                store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
-                delay(timeMillis = 280)
-                store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
-            }
+    }
+
+    private suspend fun popBackToHome() {
+        // !!! Workaround !!!
+        store.dispatchWithMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+        delay(timeMillis = 280)
+        store.dispatchWithMain(NavigationAction.PopBackTo(AppScreen.Home))
     }
 
     private suspend fun deleteUserWallets(
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/BiometricsDisabledWarningContent.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/BiometricsDisabledWarningContent.kt
index 429ab5471e..b3b50288d2 100644
--- a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/BiometricsDisabledWarningContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/BiometricsDisabledWarningContent.kt
@@ -19,7 +19,7 @@ internal fun BiometricsDisabledWarningContent(warning: WarningModel.BiometricsDi
         onDismissDialog = warning.onDismiss,
         confirmButton = DialogButton(
             title = stringResource(id = R.string.common_ok),
-            onClick = warning.onDismiss,
+            onClick = warning.onConfirm,
         ),
     )
 }
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 5e242d9cec..6bd65c13eb 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
@@ -6,6 +6,7 @@ import com.tangem.common.doOnFailure
 import com.tangem.common.doOnResult
 import com.tangem.common.doOnSuccess
 import com.tangem.common.flatMap
+import com.tangem.common.map
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Basic
@@ -55,7 +56,7 @@ internal class WelcomeMiddleware {
                 handleInitialIntent(action.intent)
             }
             is WelcomeAction.ClearUserWallets -> {
-                clearUserWallets()
+                disableUserWalletsSaving()
             }
             is WelcomeAction.ProceedWithBiometrics.Error,
             is WelcomeAction.ProceedWithCard.Error,
@@ -66,13 +67,19 @@ internal class WelcomeMiddleware {
         }
     }
 
-    private fun clearUserWallets() = scope.launch {
+    private fun disableUserWalletsSaving() = scope.launch {
         userWalletsListManager.clear()
             .flatMap { tangemSdkManager.clearSavedUserCodes() }
+            .map {
+                preferencesStorage.shouldSaveUserWallets = false
+                preferencesStorage.shouldSaveAccessCodes = false
+            }
             .doOnFailure { e ->
                 Timber.e(e, "Unable to clear user wallets")
             }
             .doOnResult {
+                // !!! Workaround !!!
+                store.dispatchWithMain(WelcomeAction.CloseError)
                 store.dispatchWithMain(NavigationAction.PopBackTo(AppScreen.Home))
             }
     }