diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 596e96bb5..df62305f5 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -866,6 +866,7 @@ class FreqtradeBot(LoggingMixin):
                 entry_tag=entry_tag, side=trade_side
             )
 
+        stake_amount = min(stake_amount, max_stake_amount)
         stake_amount = self.wallets.validate_stake_amount(pair, stake_amount, min_stake_amount)
 
         return enter_limit_requested, stake_amount
diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py
index 3ee9d57eb..9053f9cc8 100644
--- a/tests/test_freqtradebot.py
+++ b/tests/test_freqtradebot.py
@@ -743,6 +743,7 @@ def test_execute_entry(mocker, default_conf_usdt, fee, limit_order,
         (open_rate - (wallet_balance / position)) / (1 - (mm_ratio + taker_fee_rate))
         (10 - (2 / 1)) / (1 - (0.01 + 0.0006)) = 8.085708510208207
     """
+    # TODO: Parametrize this test
     open_order = limit_order_open[enter_side(is_short)]
     order = limit_order[enter_side(is_short)]
     default_conf_usdt['trading_mode'] = trading_mode