diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt
index 646a022c65..6c8e6a58e8 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensState.kt
@@ -22,10 +22,8 @@ data class TokensState(
     val scanResponse: ScanResponse? = null
 ) : StateType {
 
-    fun canHandleToken(token: TokenWithBlockchain?): Boolean {
-        val token = token ?: return false
-        val card = scanResponse?.card ?: return false
-        return card.canHandleToken(token.blockchain)
+    fun canHandleToken(token: TokenWithBlockchain): Boolean {
+        return scanResponse?.card?.canHandleToken(token.blockchain) ?: false
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
index e4f4a47ba0..d856bad451 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
@@ -107,15 +107,16 @@ fun CurrenciesScreen(
                     allowToAdd = tokensState.value.allowToAdd,
                     onAddCurrencyToggled = { currency, token ->
                         onAddCurrencyToggleClick(currency, token)
-                        if (!tokensState.value.canHandleToken(token)) {
-                            val dialog = AppDialog.SimpleOkDialog(
-                                header = context.getString(R.string.common_warning),
-                                message = context.getString(R.string.alert_manage_tokens_unsupported_message)
-                            ) {
-                                onAddCurrencyToggleClick(currency, token)
+                        token?.let {
+                            if (!tokensState.value.canHandleToken(it)) {
+                                val dialog = AppDialog.SimpleOkDialog(
+                                    header = context.getString(R.string.common_warning),
+                                    message = context.getString(R.string.alert_manage_tokens_unsupported_message)
+                                ) { onAddCurrencyToggleClick(currency, it) }
+                                store.dispatchDialogShow(dialog)
                             }
-                            store.dispatchDialogShow(dialog)
                         }
+
                     },
                     onNetworkItemClicked = onNetworkItemClicked
                 )