diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
index 8a02a4f83a..7532173467 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
@@ -332,7 +332,7 @@ internal class DefaultUserWalletsListRepository(
 
         sensitiveInformationRepository.getAll(allKeys)
             .doOnSuccess { sensitiveInfo ->
-                updateWallets { userWallets.updateWith(sensitiveInfo) }
+                updateWallets { wallets -> wallets?.updateWith(sensitiveInfo) }
             }
             .doOnFailure { raise(UnlockWalletError.UnableToUnlock) }
     }
diff --git a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
index 791434d17b..3b8a4de86d 100644
--- a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
+++ b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
@@ -572,7 +572,6 @@ internal class ChildFactory @Inject constructor(
                     context = context,
                     params = UpdateAccessCodeComponent.Params(
                         userWalletId = route.userWalletId,
-                        isFirstSetup = route.isFirstSetup,
                     ),
                     componentFactory = updateAccessCodeComponentFactory,
                 )
diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
index 95aab2d822..850968f92a 100644
--- a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
+++ b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
@@ -371,7 +371,6 @@ sealed class AppRoute(val path: String) : Route {
     @Serializable
     data class UpdateAccessCode(
         val userWalletId: UserWalletId,
-        val isFirstSetup: Boolean,
     ) : AppRoute(path = "/update_access_code/${userWalletId.stringValue}")
 
     @Serializable
diff --git a/features/hot-wallet/api/src/main/kotlin/com/tangem/features/hotwallet/UpdateAccessCodeComponent.kt b/features/hot-wallet/api/src/main/kotlin/com/tangem/features/hotwallet/UpdateAccessCodeComponent.kt
index 66b0babfe2..3ca8f98314 100644
--- a/features/hot-wallet/api/src/main/kotlin/com/tangem/features/hotwallet/UpdateAccessCodeComponent.kt
+++ b/features/hot-wallet/api/src/main/kotlin/com/tangem/features/hotwallet/UpdateAccessCodeComponent.kt
@@ -7,7 +7,6 @@ import com.tangem.domain.models.wallet.UserWalletId
 interface UpdateAccessCodeComponent : ComposableContentComponent {
     data class Params(
         val userWalletId: UserWalletId,
-        val isFirstSetup: Boolean,
     )
     interface Factory : ComponentFactory<Params, UpdateAccessCodeComponent>
 }
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt
index c24c23da55..6d7bc20a66 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt
@@ -75,7 +75,6 @@ internal class CreateWalletBackupModel @Inject constructor(
             router.replaceCurrent(
                 route = AppRoute.UpdateAccessCode(
                     userWalletId = params.userWalletId,
-                    isFirstSetup = true,
                 ),
             )
         } else {
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/updateaccesscode/UpdateAccessCodeModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/updateaccesscode/UpdateAccessCodeModel.kt
index 5195793635..82c10d1309 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/updateaccesscode/UpdateAccessCodeModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/updateaccesscode/UpdateAccessCodeModel.kt
@@ -43,11 +43,7 @@ internal class UpdateAccessCodeModel @Inject constructor(
     }
 
     override fun onAccessCodeUpdated(userWalletId: UserWalletId) {
-        if (params.isFirstSetup) {
-            stackNavigation.push(UpdateAccessCodeRoute.SetupFinished)
-        } else {
-            router.pop()
-        }
+        stackNavigation.push(UpdateAccessCodeRoute.SetupFinished)
     }
 
     inner class MobileWalletSetupFinishedComponentModelCallbacks : MobileWalletSetupFinishedComponent.ModelCallbacks {
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
index 3ae50762c4..37db0aaeca 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
@@ -365,7 +365,6 @@ internal class WalletSettingsModel @Inject constructor(
                 router.push(
                     route = AppRoute.UpdateAccessCode(
                         userWalletId = params.userWalletId,
-                        isFirstSetup = !authorizationRequired,
                     ),
                 )
             }