diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 28be7b6a3..186161719 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -313,15 +313,8 @@ abstract class ExchangeViewModelBase with Store {
       final amount = isReceiveAmountEntered
           ? receiveAmount
           : depositAmount;
-
-      final amountParts = amount.replaceAll(',', '.')
-          .split('.');
-
-      final numberOfFractionDigits =
-      amountParts.length > 1
-          ? amountParts[1].length : 0;
-
-      isValid = !(numberOfFractionDigits > 8);
+      isValid = RegExp('^([0-9]+([.\,][0-9]{0,8})?|[.\,][0-9]{1,8})\$')
+          .hasMatch(amount);
     }
 
     return isValid;