diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
index fc245c3db4..761fee04ea 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
@@ -178,7 +178,16 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                     is Result.Success -> {
                         updateScanResponse(result.data)
                         delay(DELAY_SDK_DIALOG_CLOSE)
-                        withMainContext { store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.TopUpWallet)) }
+                        withMainContext {
+                            when (twinCardsState.mode) {
+                                CreateTwinWalletMode.CreateWallet -> {
+                                    store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.TopUpWallet))
+                                }
+                                CreateTwinWalletMode.RecreateWallet -> {
+                                    store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.Done))
+                                }
+                            }
+                        }
                     }
                     is Result.Failure -> {
                     }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
index 140211ceb8..d0ba56eeb5 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
@@ -37,7 +37,6 @@ import kotlinx.android.synthetic.main.layout_onboarding_container_top.*
 import kotlinx.android.synthetic.main.view_bg_twins_welcome.*
 import kotlinx.android.synthetic.main.view_onboarding_progress.*
 import kotlinx.android.synthetic.main.view_onboarding_tv_balance.*
-import org.rekotlin.Action
 
 class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
@@ -150,14 +149,17 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
     }
 
     private fun setupWelcomeOnlyState(state: TwinCardsState) {
-        setupWelcomeState(state, NavigationAction.NavigateTo(AppScreen.Wallet))
+        setupWelcomeState(state) {
+            store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet))
+            store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.None))
+        }
     }
 
     private fun setupWelcomeState(state: TwinCardsState) {
-        setupWelcomeState(state, TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet))
+        setupWelcomeState(state) { store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.CreateFirstWallet)) }
     }
 
-    private fun setupWelcomeState(state: TwinCardsState, mainAction: Action) {
+    private fun setupWelcomeState(state: TwinCardsState, mainAction: VoidCallback) {
         twinsWidget.toWelcome(false) { startPostponedEnterTransition() }
 
         onboarding_twins_welcome_bg.show()
@@ -167,7 +169,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         tv_body.text = getString(R.string.twins_onboarding_description_format, state.cardNumber?.pairIndexNumber())
 
         btn_main_action.setText(R.string.common_continue)
-        btn_main_action.setOnClickListener { store.dispatch(mainAction) }
+        btn_main_action.setOnClickListener { mainAction() }
     }
 
     private fun setupWarningState(state: TwinCardsState) {