diff --git a/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt b/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt
index f54300f3ec..0b4a56fa11 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt
@@ -4,7 +4,6 @@ sealed class WalletWarning(
     val showingPosition: Int,
 ) {
     object TransactionInProgress : WalletWarning(10)
-    object SolanaTokensUnsupported : WalletWarning(20)
     data class BalanceNotEnoughForFee(val blockchainFullName: String) : WalletWarning(30)
     data class Rent(val walletRent: WalletRent) : WalletWarning(40)
 }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
index 1bbf3366a6..749f84b926 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
@@ -9,7 +9,6 @@ import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.address.AddressType
 import com.tangem.common.extensions.isZero
-import com.tangem.domain.common.extensions.canHandleToken
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.features.addCustomToken.CustomCurrency
 import com.tangem.tap.common.entities.Button
@@ -36,8 +35,8 @@ import com.tangem.tap.features.wallet.ui.BalanceWidgetData
 import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
 import com.tangem.tap.store
 import java.math.BigDecimal
-import org.rekotlin.StateType
 import kotlin.properties.ReadOnlyProperty
+import org.rekotlin.StateType
 
 data class WalletState(
     val state: ProgressState = ProgressState.Done,
@@ -417,19 +416,10 @@ data class WalletData(
     }
 
     fun assembleWarnings(): List<WalletWarning> {
-        val blockchain = currency.blockchain
         val walletWarnings = mutableListOf<WalletWarning>()
         if (currencyData.status == BalanceStatus.SameCurrencyTransactionInProgress) {
             walletWarnings.add(WalletWarning.TransactionInProgress)
         }
-        if (currency.isBlockchain()) {
-            if (blockchain == Blockchain.Solana || blockchain == Blockchain.SolanaTestnet) {
-                val card = store.state.globalState.scanResponse?.card
-                if (card?.canHandleToken(blockchain) == false) {
-                    walletWarnings.add(WalletWarning.SolanaTokensUnsupported)
-                }
-            }
-        }
         if (walletRent != null) {
             walletWarnings.add(WalletWarning.Rent(walletRent))
         }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
index 6137f344e3..1e9e127e59 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
@@ -21,9 +21,6 @@ class WalletWarningConverter(
                     message.blockchainFullName, message.blockchainFullName
                 )
             }
-            WalletWarning.SolanaTokensUnsupported -> {
-                context.getString(R.string.warning_token_send_unsupported_message)
-            }
             WalletWarning.TransactionInProgress -> {
                 context.getString(R.string.wallet_pending_transaction_warning)
             }