diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index e44193f21..8007d520e 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -1415,7 +1415,8 @@ class FreqtradeBot(LoggingMixin):
             return real_amount
         return amount
 
-    def handle_order_fee(self, trade: Trade, order_obj: Order, order: Dict[str, Any]) -> Dict[str, Any]:
+    def handle_order_fee(
+            self, trade: Trade, order_obj: Order, order: Dict[str, Any]) -> Dict[str, Any]:
         # Try update amount (binance-fix)
         try:
             new_amount = self.get_real_amount(trade, order)
diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py
index 0ee50d1c7..49ce34158 100644
--- a/freqtrade/persistence/models.py
+++ b/freqtrade/persistence/models.py
@@ -187,7 +187,6 @@ class Order(_DECL_BASE):
             if (order.get('filled', 0.0) or 0.0) > 0:
                 self.order_filled_date = datetime.now(timezone.utc)
         self.order_update_date = datetime.now(timezone.utc)
-        return self
 
     def to_json(self) -> Dict[str, Any]:
         return {
diff --git a/tests/test_freqtradebot.py b/tests/test_freqtradebot.py
index 735a95231..d7b47174b 100644
--- a/tests/test_freqtradebot.py
+++ b/tests/test_freqtradebot.py
@@ -1738,7 +1738,6 @@ def test_update_trade_state_withorderdict(default_conf_usdt, trades_for_order, l
         assert not log_has_re(log_text, caplog)
 
 
-
 def test_update_trade_state_exception(mocker, default_conf_usdt,
                                       limit_buy_order_usdt, caplog) -> None:
     freqtrade = get_patched_freqtradebot(mocker, default_conf_usdt)
diff --git a/tests/test_integration.py b/tests/test_integration.py
index ed38f1fec..db3b1b5fc 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -4,6 +4,7 @@ import pytest
 
 from freqtrade.enums import SellType
 from freqtrade.persistence import Trade
+from freqtrade.persistence.models import Order
 from freqtrade.rpc.rpc import RPC
 from freqtrade.strategy.interface import SellCheckTuple
 from tests.conftest import get_patched_freqtradebot, patch_get_signal
@@ -94,7 +95,11 @@ def test_may_execute_exit_stoploss_on_exchange_multi(default_conf, ticker, fee,
     trades = Trade.query.all()
     # Make sure stoploss-order is open and trade is bought (since we mock update_trade_state)
     for trade in trades:
-        trade.stoploss_order_id = 3
+        stoploss_order_closed['id'] = '3'
+        oobj = Order.parse_from_ccxt_object(stoploss_order_closed, trade.pair, 'stoploss')
+
+        trade.orders.append(oobj)
+        trade.stoploss_order_id = '3'
         trade.open_order_id = None
 
     n = freqtrade.exit_positions(trades)