diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
index 74a81982cb..bb1842d035 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@@ -648,7 +648,7 @@ internal class StateBuilder(
         val fee = requireNotNull(dataState.selectedFee)
         val fromCryptoCurrency = requireNotNull(dataState.fromCryptoCurrency)
         val toCryptoCurrency = requireNotNull(dataState.toCryptoCurrency)
-        val fromAmount = requireNotNull(dataState.amount?.toBigDecimal())
+        val fromAmount = toBigDecimalOrNull(requireNotNull(dataState.amount))
         val toAmount = requireNotNull(dataState.swapDataModel?.toTokenAmount?.value)
         val providerState = uiState.providerState as ProviderState.Content
 
@@ -1136,6 +1136,10 @@ internal class StateBuilder(
         return this.divide(to, min(decimals, MAX_DECIMALS_TO_SHOW), RoundingMode.HALF_UP)
     }
 
+    private fun toBigDecimalOrNull(text: String): BigDecimal? {
+        return text.replace(",", ".").toBigDecimalOrNull()
+    }
+
     private companion object {
         const val ADDRESS_MIN_LENGTH = 11
         const val ADDRESS_FIRST_PART_LENGTH = 7