diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
index db67d87dff..066158592c 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/ScanNoteTask.kt
@@ -16,6 +16,7 @@ import com.tangem.common.extensions.toHexString
 import com.tangem.tap.domain.TapSdkError
 import com.tangem.tap.domain.TapWorkarounds.isExcluded
 import com.tangem.tap.domain.TapWorkarounds.isMultiCurrencyWallet
+import com.tangem.tap.domain.TapWorkarounds.isNote
 import com.tangem.tap.domain.extensions.getSingleWallet
 import com.tangem.tap.domain.extensions.getStatus
 import com.tangem.tap.domain.twins.TwinCardsManager
@@ -149,8 +150,8 @@ class ScanNoteTask(val card: Card? = null) : CardSessionRunnable<ScanNoteRespons
         if (card.isExcluded()) return TapSdkError.CardForDifferentApp
         if (card.status == CardStatus.Purged) return TangemSdkError.WalletIsPurged()
         if (card.status == CardStatus.NotPersonalized) return TangemSdkError.NotPersonalized()
-        // Disable new multi-currency HD wallet cards on the old version of the app
-        if (card.isMultiCurrencyWallet()) return UpdateAppToUseThisCard()
+        // Disable new cards on the old version of the app // TODO: remove when cards are supported
+        if (card.isMultiCurrencyWallet() || card.isNote()) return UpdateAppToUseThisCard()
         return null
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index f5f61139b1..98c2b0d6fe 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -94,7 +94,10 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     override fun newState(state: WalletState) {
         if (activity == null) return
 
-        if (state.isMultiwalletAllowed && walletView is SingleWalletView) {
+        if (state.isMultiwalletAllowed &&
+            state.primaryWallet?.currencyData?.status != BalanceStatus.EmptyCard &&
+            walletView is SingleWalletView
+        ) {
             walletView = MultiWalletView()
             walletView.changeWalletView(this)
         } else if (!state.isMultiwalletAllowed && walletView is MultiWalletView) {