diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
index a674196d0d..54cca1b8dc 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
@@ -56,15 +56,12 @@ internal class DefaultTokensListRouter(
                 headerId = R.string.common_warning,
                 messageId = R.string.alert_manage_tokens_unsupported_message,
             )
-            Blockchain.Chia, Blockchain.ChiaTestnet -> AppDialog.SimpleOkDialogRes(
+            else -> AppDialog.SimpleOkDialogRes(
                 headerId = R.string.common_warning,
                 messageId = R.string.alert_manage_tokens_unsupported_curve_message,
                 args = listOf(blockchain.fullName),
             )
-            else -> null // there's no alerts for other blockchains yer
-        }
-        if (alert != null) {
-            store.dispatchDialogShow(alert)
         }
+        store.dispatchDialogShow(alert)
     }
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
index 9085357e7e..0970e85d77 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
@@ -214,6 +214,4 @@ private val excludedBlockchains = listOf(
     Blockchain.Ducatus,
     Blockchain.Telos, // disable in 4.9
     Blockchain.TelosTestnet, // disable in 4.9
-    Blockchain.OctaSpace,
-    Blockchain.OctaSpaceTestnet,
 )
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
index 2509479732..8420054345 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
@@ -53,18 +53,26 @@ fun CardDTO.supportedTokens(cardTypesResolver: CardTypesResolver): List<Blockcha
 }
 
 fun CardDTO.canHandleToken(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean {
-    return this.supportedTokens(cardTypesResolver).contains(blockchain)
+    val isContainsBlockchain = this.supportedTokens(cardTypesResolver).contains(blockchain)
+    val isWalletForCurveExists =
+        wallets.map { it.curve }.intersect(blockchain.getSupportedCurves().toSet()).isNotEmpty()
+    // fixme: check for first wallets with 1 curve and remove condition
+    return if (cardTypesResolver.isTangemWallet() || cardTypesResolver.isWallet2()) {
+        // if there's no wallet on card for blockchain with given curve
+        isContainsBlockchain && isWalletForCurveExists
+    } else {
+        isContainsBlockchain
+    }
 }
 
 fun CardDTO.canHandleBlockchain(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean {
-    val supportedBlockchains = this.supportedBlockchains(cardTypesResolver)
-    val isContainsBlockchain = supportedBlockchains.contains(blockchain)
-    return if (cardTypesResolver.isTangemWallet()) {
-        // specific workaround for multiwallet v1 with different curves
-        // cause on early created wallets there's no created bls curve wallet
-        // but user can recreate wallet with curve in current app version
-        isContainsBlockchain &&
-            wallets.map { it.curve }.intersect(blockchain.getSupportedCurves().toSet()).isNotEmpty()
+    val isContainsBlockchain = this.supportedBlockchains(cardTypesResolver).contains(blockchain)
+    val isWalletForCurveExists =
+        wallets.map { it.curve }.intersect(blockchain.getSupportedCurves().toSet()).isNotEmpty()
+    // fixme: check for first wallets with 1 curve and remove condition
+    return if (cardTypesResolver.isTangemWallet() || cardTypesResolver.isWallet2()) {
+        // if there's no wallet on card for blockchain with given curve
+        isContainsBlockchain && isWalletForCurveExists
     } else {
         isContainsBlockchain
     }