diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
index e7c01ea29e..90aa10f2cd 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@@ -82,6 +82,7 @@ class DetailsMiddleware {
     }
 
     class EraseWalletMiddleware {
+        @Suppress("CyclomaticComplexMethod")
         fun handle(action: DetailsAction.ResetToFactory) {
             when (action) {
                 is DetailsAction.ResetToFactory.Start -> {
@@ -136,7 +137,7 @@ class DetailsMiddleware {
                                 } else {
                                     val isLocked = runCatching { userWalletsListManager.asLockable()?.isLockedSync }
                                         .fold(onSuccess = { true }, onFailure = { false })
-                                    if (isLocked) {
+                                    if (isLocked && userWalletsListManager.hasUserWallets) {
                                         store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Welcome))
                                     } else {
                                         store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
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 e7919af2f3..c2fc60baaa 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
@@ -12,7 +12,6 @@ import com.tangem.domain.common.util.twinsIsTwinned
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.userwallets.UserWalletIdBuilder
 import com.tangem.domain.wallets.legacy.asLockable
-import com.tangem.domain.wallets.legacy.isLockedSync
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.entities.ProgressState