diff --git a/freqtrade/main.py b/freqtrade/main.py
index afbb84ec4..8d4fccd6e 100755
--- a/freqtrade/main.py
+++ b/freqtrade/main.py
@@ -93,7 +93,6 @@ def _process(nb_assets: Optional[int] = 0) -> bool:
                 # Check if we can sell our current pair
                 state_changed = handle_trade(trade) or state_changed
 
-            Trade.session.flush()
     except (requests.exceptions.RequestException, json.JSONDecodeError) as error:
         logger.warning(
             'Got %s in _process(), retrying in 30 seconds...',
@@ -107,6 +106,7 @@ def _process(nb_assets: Optional[int] = 0) -> bool:
         ))
         logger.exception('Got OperationalException. Stopping trader ...')
         update_state(State.STOPPED)
+    Trade.session.flush()
     return state_changed