diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index 88121813ad..391d65cb96 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -91,7 +91,12 @@ private fun handleWalletAction(action: Action) {
                                 BlockchainNetwork(Blockchain.Bitcoin, result.data.card),
                                 BlockchainNetwork(Blockchain.Ethereum, result.data.card)
                             )
-                            store.dispatchOnMain(WalletAction.MultiWallet.SaveCurrencies(blockchainNetworks))
+                            store.dispatchOnMain(
+                                WalletAction.MultiWallet.SaveCurrencies(
+                                    blockchainNetworks = blockchainNetworks,
+                                    cardId = result.data.card.cardId
+                                )
+                            )
                             onboardingManager.activationStarted(updatedResponse.card.cardId)
                             store.dispatch(OnboardingWalletAction.ProceedBackup)
                         }
@@ -272,7 +277,11 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
                             BlockchainNetwork(Blockchain.Bitcoin, result.data),
                             BlockchainNetwork(Blockchain.Ethereum, result.data)
                         )
-                        store.dispatchOnMain(WalletAction.MultiWallet.SaveCurrencies(blockchainNetworks))
+                        store.dispatchOnMain(
+                            WalletAction.MultiWallet.SaveCurrencies(
+                                blockchainNetworks = blockchainNetworks, cardId = result.data.cardId
+                            )
+                        )
                         if (backupService.currentState == BackupService.State.Finished) {
                             store.dispatchOnMain(BackupAction.FinishBackup)
                         } else {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
index 59556b5893..c3b5ccf6ea 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
@@ -61,7 +61,9 @@ sealed class WalletAction : Action {
             MultiWallet()
 
         data class AddToken(val token: Token, val blockchain: BlockchainNetwork) : MultiWallet()
-        data class SaveCurrencies(val blockchainNetworks: List<BlockchainNetwork>) : MultiWallet()
+        data class SaveCurrencies(
+            val blockchainNetworks: List<BlockchainNetwork>, val cardId: String? = null
+        ) : MultiWallet()
 //        object FindTokensInUse : MultiWallet()
 //        object FindBlockchainsInUse : MultiWallet()
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
index 04bf56dad7..4030bae09b 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
@@ -77,9 +77,8 @@ class MultiWalletMiddleware {
                 )
             }
             is WalletAction.MultiWallet.SaveCurrencies -> {
-                globalState.scanResponse?.card?.cardId?.let {
-                    currenciesRepository.saveCurrencies(it, action.blockchainNetworks)
-                }
+                val cardId = action.cardId ?: globalState.scanResponse?.card?.cardId ?: return
+                currenciesRepository.saveCurrencies(cardId, action.blockchainNetworks)
             }
             is WalletAction.MultiWallet.TryToRemoveWallet -> {
                 val currency = action.currency