diff --git a/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt b/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt
index da24d1337d..e97662d28f 100644
--- a/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt
+++ b/app/src/main/java/com/tangem/tap/common/shop/shopify/ShopifyService.kt
@@ -1,4 +1,4 @@
-package com.tangem.tap.common.shop
+package com.tangem.tap.common.shop.shopify
 
 import android.app.Application
 import com.shopify.buy3.GraphCallResult
@@ -7,7 +7,6 @@ import com.shopify.buy3.RetryHandler
 import com.shopify.buy3.Storefront.*
 import com.shopify.graphql.support.ID
 import com.shopify.graphql.support.Input
-import com.tangem.tap.common.shop.shopify.ShopifyShop
 import com.tangem.tap.common.shop.shopify.data.CheckoutItem
 import com.tangem.tap.common.shop.shopify.data.checkoutFieldsFragment
 import com.tangem.tap.common.shop.shopify.data.collectionFieldsFragment
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 70f062d9ea..9abbebd018 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
@@ -124,10 +124,15 @@ private fun handleWalletAction(action: Action) {
                     } else {
                         null
                     }
-                    BackupAction.IntroduceBackup(url)
+                    if (walletState.backupState.backupStep == BackupStep.InitBackup ||
+                        walletState.backupState.backupStep == BackupStep.Finished) {
+                        BackupAction.IntroduceBackup(url)
+                    } else {
+                        null
+                    }
                 }
             }
-            store.dispatch(newAction)
+            newAction?.let { store.dispatch(it) }
         }
         OnboardingWalletAction.OnBackPressed -> {
             when (walletState.backupState.backupStep) {