diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
index c83c9220a0..174766a762 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletState.kt
@@ -44,7 +44,7 @@ data class OnboardingWalletState(
                     SaltPayRegistrationStep.NoGas -> 1
                     SaltPayRegistrationStep.NeedPin -> 7
                     SaltPayRegistrationStep.CardRegistration -> 8
-                    SaltPayRegistrationStep.Kyc -> 9
+                    SaltPayRegistrationStep.KycIntro -> 9
                     SaltPayRegistrationStep.KycStart -> 10
                     SaltPayRegistrationStep.KycWaiting -> 11
                     SaltPayRegistrationStep.Finished -> getMaxProgress()
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt
index 810272f6a5..31c16e9525 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt
@@ -107,7 +107,7 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
 
                 withMainContext {
                     handleIsBusy = false
-                    store.dispatch(OnboardingSaltPayAction.SetStep(SaltPayRegistrationStep.Kyc))
+                    store.dispatch(OnboardingSaltPayAction.SetStep(SaltPayRegistrationStep.KycIntro))
                 }
             }
         }
@@ -268,7 +268,7 @@ fun RegistrationResponse.Item.toSaltPayStep(): SaltPayRegistrationStep {
         // kycDate is set, go to kyc waiting screen
         kycDate != null -> SaltPayRegistrationStep.KycWaiting
 
-        else -> SaltPayRegistrationStep.KycStart
+        else -> SaltPayRegistrationStep.KycIntro
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 632a415eea..ab7b23fb38 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -34,6 +34,8 @@ import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.extensions.stop
 import com.tangem.tap.common.feedback.SupportInfo
 import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.common.toggleWidget.IndeterminateProgressButtonWidget
 import com.tangem.tap.features.FragmentOnBackPressedHandler
 import com.tangem.tap.features.addBackPressHandler
@@ -509,7 +511,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
                 SaltPayRegistrationStep.NoGas -> handleNoGas()
                 SaltPayRegistrationStep.NeedPin -> handleNeedPin()
                 SaltPayRegistrationStep.CardRegistration -> handleCardRegistration()
-                SaltPayRegistrationStep.Kyc -> handleKyc()
+                SaltPayRegistrationStep.KycIntro -> handleKycIntro()
                 SaltPayRegistrationStep.KycStart -> handleKycStart(state)
                 SaltPayRegistrationStep.KycWaiting -> handleKycWaiting()
                 SaltPayRegistrationStep.Finished -> handleFinished()
@@ -518,6 +520,8 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
         }
 
         private fun handleNoGas() {
+            // normally this shouldn't happen
+            store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
             store.dispatchDialogShow(SaltPayDialog.NoFundsForActivation)
         }
 
@@ -550,7 +554,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
             }
         }
 
-        private fun handleKyc() = with(walletFragment.bindingSaltPay) {
+        private fun handleKycIntro() = with(walletFragment.bindingSaltPay) {
             toolbar.title = walletFragment.getString(R.string.onboarding_navbar_kyc_start)
             showOnlyView(verifyIdentity.root) {
                 progressButton = SaltPayProgressButton(verifyIdentity.root)