diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 051524a..9ae3665 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -2773,10 +2773,6 @@ UniValue bumpfee(const JSONRPCRequest& request)
                 throw JSONRPCError(RPC_INVALID_PARAMETER,
                                    strprintf("Insufficient totalFee (cannot be less than required fee %s)",
                                              FormatMoney(requiredFee)));
-            } else if (totalFee > maxTxFee) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER,
-                                   strprintf("Invalid totalFee (cannot be higher than maxTxFee %s)",
-                                             FormatMoney(maxTxFee)));
             }
         }

@@ -2817,6 +2813,13 @@ UniValue bumpfee(const JSONRPCRequest& request)
         }
     }

+    // Check that in all cases the new fee doesn't violate maxTxFee
+     if (nNewFee > maxTxFee) {
+         throw JSONRPCError(RPC_MISC_ERROR,
+                            strprintf("Specified or calculated fee %s is too high (cannot be higher than maxTxFee %s)",
+                                      FormatMoney(nNewFee), FormatMoney(maxTxFee)));
+     }
+
     // check that fee rate is higher than mempool's minimum fee
     // (no point in bumping fee if we know that the new tx won't be accepted to the mempool)
     // This may occur if the user set TotalFee or paytxfee too low, if fallbackfee is too low, or, perhaps,