diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index f2cd4c5dd..44d1c31eb 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -1376,7 +1376,7 @@ class FreqtradeBot:
         """
         if not order_id:
             logger.warning(f'Orderid for trade {trade} is empty.')
-            False
+            return False
 
         # Update trade with order values
         logger.info('Found open order for %s', trade)
diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py
index 2f8e5aef6..fe5b64d5b 100644
--- a/tests/test_freqtradebot.py
+++ b/tests/test_freqtradebot.py
@@ -1737,6 +1737,8 @@ def test_update_trade_state(mocker, default_conf, limit_buy_order, caplog) -> No
         open_date=arrow.utcnow().datetime,
         amount=11,
     )
+    assert not freqtrade.update_trade_state(trade, None)
+    assert log_has_re(r'Orderid for trade .* is empty.', caplog)
     # Add datetime explicitly since sqlalchemy defaults apply only once written to database
     freqtrade.update_trade_state(trade, '123')
     # Test amount not modified by fee-logic