diff --git a/app/src/main/java/com/tangem/tap/domain/model/UserWallet.kt b/app/src/main/java/com/tangem/tap/domain/model/UserWallet.kt
index a4433cb32a..4ad10ad879 100644
--- a/app/src/main/java/com/tangem/tap/domain/model/UserWallet.kt
+++ b/app/src/main/java/com/tangem/tap/domain/model/UserWallet.kt
@@ -12,6 +12,8 @@ import com.tangem.domain.common.util.UserWalletId
  * @param scanResponse [ScanResponse] of primary user's wallet card.
  * TODO: Replace with [com.tangem.domain.common.CardDTO]
  * @property cardId ID of user's wallet primary card
+ * @property hasAccessCode Indicates if the user's wallet primary card has access code
+ * @property isSaved Indicates if this user wallet is saved
  * */
 data class UserWallet(
     val name: String,
@@ -23,5 +25,8 @@ data class UserWallet(
     val cardId: String
         get() = scanResponse.card.cardId
 
+    val hasAccessCode: Boolean
+        get() = scanResponse.card.isAccessCodeSet
+
     internal var isSaved: Boolean = true
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
index bd8b4d0459..e0bdc6c843 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -93,6 +93,12 @@ internal class SaveWalletMiddleware {
                     preferencesStorage.shouldSaveAccessCodes = isFirstSavedWallet ||
                         preferencesStorage.shouldSaveAccessCodes
 
+
+                    tangemSdkManager.setAccessCodeRequestPolicy(
+                        useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes &&
+                            userWallet.hasAccessCode,
+                    )
+
                     val isSavedWalletSelected =
                         userWalletsListManager.selectedUserWalletSync?.walletId == userWallet.walletId
 
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 ae053d797b..c915598593 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
@@ -221,7 +221,7 @@ internal class WalletSelectorMiddleware {
     private fun updateAccessCodeRequestPolicy(userWallet: UserWallet) {
         tangemSdkManager.setAccessCodeRequestPolicy(
             useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes &&
-                userWallet.scanResponse.card.isAccessCodeSet,
+                userWallet.hasAccessCode,
         )
     }
 
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 88c0038a3c..11508acf00 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
@@ -61,7 +61,7 @@ internal class WelcomeMiddleware {
                     if (selectedUserWallet != null) {
                         tangemSdkManager.setAccessCodeRequestPolicy(
                             useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes &&
-                                selectedUserWallet.scanResponse.card.isAccessCodeSet,
+                                selectedUserWallet.hasAccessCode,
                         )
 
                         store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))