diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapComponent.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapComponent.kt
index 6bb735f4f8..6a88017cb4 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapComponent.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapComponent.kt
@@ -107,10 +107,7 @@ internal class DefaultSwapComponent @AssistedInject constructor(
             val fromCryptoCurrency by remember { derivedStateOf { dataState.fromCryptoCurrency } }
             val feePaidCryptoCurrency by remember { derivedStateOf { dataState.feePaidCryptoCurrency } }
             val shouldHideBlock by remember {
-                derivedStateOf {
-                    dataState.amount.isNullOrBlank() || BigDecimal(dataState.amount).isZero() ||
-                        model.uiState.isInsufficientFunds
-                }
+                derivedStateOf { toBigDecimalOrZero(dataState.amount).isZero() || model.uiState.isInsufficientFunds }
             }
 
             LaunchedEffect(fromCryptoCurrency, feePaidCryptoCurrency, shouldHideBlock) {
@@ -208,6 +205,10 @@ internal class DefaultSwapComponent @AssistedInject constructor(
         )
     }
 
+    private fun toBigDecimalOrZero(bigDecimalString: String?): BigDecimal {
+        return bigDecimalString?.replace(",", ".")?.toBigDecimalOrNull() ?: BigDecimal.ZERO
+    }
+
     @AssistedFactory
     interface Factory : SwapComponent.Factory {
         override fun create(context: AppComponentContext, params: SwapComponent.Params): DefaultSwapComponent