diff --git a/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt b/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt
index 614b462e24..195b2c9069 100644
--- a/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt
+++ b/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt
@@ -111,7 +111,6 @@ internal class AskBiometryModel @Inject constructor(
 
     private suspend fun handleSuccessAllowing(userWallet: UserWallet) {
         walletsRepository.saveShouldSaveUserWallets(item = true)
-        settingsRepository.setShouldSaveAccessCodes(value = true)
 
         if (hotWalletFeatureToggles.isHotWalletEnabled) {
             walletsRepository.setUseBiometricAuthentication(value = true)
@@ -120,6 +119,7 @@ internal class AskBiometryModel @Inject constructor(
                 isBiometricsRequestPolicy = walletsRepository.requireAccessCode().not(),
             )
         } else {
+            settingsRepository.setShouldSaveAccessCodes(value = true)
             if (userWallet is UserWallet.Cold) {
                 cardSdkConfigRepository.setAccessCodeRequestPolicy(
                     isBiometricsRequestPolicy = userWallet.hasAccessCode,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
index 14324845f1..e7a00027c6 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
@@ -363,6 +363,9 @@ internal class WalletModel @Inject constructor(
             is WalletsUpdateActionResolver.Action.RenameWallets -> {
                 stateHolder.update(transformer = RenameWalletsTransformer(renamedWallets = action.renamedWallets))
             }
+            WalletsUpdateActionResolver.Action.EmptyWallets -> {
+                Timber.w("Wallets list is empty!")
+            }
             is WalletsUpdateActionResolver.Action.Unknown -> {
                 Timber.w("Unable to perform action: $action")
             }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt
index 48ee23027a..3e9a4d114b 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt
@@ -25,6 +25,10 @@ internal class WalletsUpdateActionResolver @Inject constructor(
 ) {
 
     fun resolve(wallets: List<UserWallet>, currentState: WalletScreenState): Action {
+        if (wallets.isEmpty()) {
+            return Action.EmptyWallets
+        }
+
         val selectedWallet = getSelectedWalletSyncUseCase().getOrElse {
             /* Selected user wallet can be null after reset if remaining user wallets is locked */
             return Action.Unknown
@@ -319,6 +323,8 @@ internal class WalletsUpdateActionResolver @Inject constructor(
             }
         }
 
+        data object EmptyWallets : Action()
+
         data object Unknown : Action()
     }
 }
\ No newline at end of file