diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
index 6a633677b8..993830329a 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
@@ -43,20 +43,14 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
         }
         is GlobalAction.SetWarningManager -> globalState.copy(warningManager = action.warningManager)
         is GlobalAction.UpdateWalletSignedHashes -> {
-            val wallet = globalState.scanResponse?.card
-                    ?.wallet(action.walletPublicKey)
-                    ?.copy(
-                        totalSignedHashes = action.walletSignedHashes,
-                        remainingSignatures = action.remainingSignatures
-                    )
-            val card = globalState.scanResponse?.card
-            wallet?.let { globalState.scanResponse.card.updateWallet(wallet) }
+            val card = globalState.scanResponse?.card ?: return globalState
+            val wallet = card.wallet(action.walletPublicKey) ?: return globalState
 
-            if (card != null) {
-                globalState.copy(scanResponse = globalState.scanResponse.copy(card = card))
-            } else {
-                globalState
-            }
+            val newCardInstance = card.updateWallet(wallet.copy(
+                totalSignedHashes = action.walletSignedHashes,
+                remainingSignatures = action.remainingSignatures
+            ))
+            globalState.copy(scanResponse = globalState.scanResponse.copy(card = newCardInstance))
         }
         is GlobalAction.SetFeedbackManager -> {
             globalState.copy(feedbackManager = action.feedbackManager)
diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index 27776c28b7..27cb46c500 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -125,6 +125,7 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
 
     companion object {
         val config = Config(
+            linkedTerminal = true,
             allowUntrustedCards = true,
             filter = CardFilter(
                 allowedCardTypes = FirmwareVersion.FirmwareType.values().toList()