diff --git a/desktop/src/main/java/bisq/desktop/util/validation/BsqValidator.java b/desktop/src/main/java/bisq/desktop/util/validation/BsqValidator.java
index 5d913f26273..4749354771d 100644
--- a/desktop/src/main/java/bisq/desktop/util/validation/BsqValidator.java
+++ b/desktop/src/main/java/bisq/desktop/util/validation/BsqValidator.java
@@ -52,8 +52,8 @@ protected double getMinValue() {
     @Inject
     public BsqValidator(BsqFormatter bsqFormatter) {
         this.bsqFormatter = bsqFormatter;
-        // TODO do we want a limit here?
-        //setMaxValue(bsqFormatter.parseToCoin("2500000"));
+        // Limit to avoid overflows
+        setMaxValue(bsqFormatter.parseToCoin("10000000"));
     }
 
     public void setMinValue(@NotNull Coin minValue) {
@@ -79,7 +79,11 @@ public ValidationResult validate(String input) {
         if (result.isValid) {
             result = validateIfNotZero(input)
                     .and(validateIfNotNegative(input))
-                    .and(validateIfNotFractionalBtcValue(input))
+                    .and(validateIfNotExceedsMaxValue(input));
+        }
+
+        if (result.isValid) {
+            result = validateIfNotFractionalBtcValue(input)
                     .and(validateIfNotExceedsMaxBtcValue(input))
                     .and(validateIfSufficientAvailableBalance(input))
                     .and(validateIfAboveDust(input))