diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index 65d3bd507f..fc1d4e3958 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -1,16 +1,12 @@
 package com.tangem.tap.domain
 
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.BlockchainSdkConfig
-import com.tangem.blockchain.common.Token
-import com.tangem.blockchain.common.Wallet
-import com.tangem.blockchain.common.WalletManagerFactory
+import com.tangem.blockchain.common.*
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
 import com.tangem.core.analytics.Analytics
 import com.tangem.datasource.config.ConfigManager
-import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.common.extensions.withMainContext
+import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.operations.attestation.Attestation
 import com.tangem.tap.common.analytics.events.Basic
@@ -39,6 +35,9 @@ class TapWalletManager {
     }
 
     suspend fun onWalletSelected(userWallet: UserWallet, refresh: Boolean, sendAnalyticsEvent: Boolean) {
+        // do nothing if its the same wallet
+        if (store.state.globalState.scanResponse == userWallet.scanResponse) return
+
         Analytics.setContext(userWallet.scanResponse)
         if (sendAnalyticsEvent) {
             Analytics.send(Basic.WalletOpened())
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 e3837cd4a9..c2af40ad5d 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
@@ -17,6 +17,7 @@ import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.getAddressData
 import com.tangem.tap.common.extensions.getTopUpUrl
+import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.postUi
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
@@ -136,6 +137,12 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                         userWalletsListManager.delete(
                             listOfNotNull(UserWalletIdBuilder.scanResponse(getScanResponse()).build()),
                         )
+                        userWalletsListManager.selectedUserWalletSync?.let { selectedWallet ->
+                            store.onUserWalletSelected(
+                                userWallet = selectedWallet,
+                                sendAnalyticsEvent = false,
+                            )
+                        }
                     }
                 }
                 TwinCardsStep.TopUpWallet -> {