diff --git a/assume/markets/base_market.py b/assume/markets/base_market.py
index c99c047d..e658c753 100644
--- a/assume/markets/base_market.py
+++ b/assume/markets/base_market.py
@@ -610,6 +610,12 @@ async def clear_market(self, market_products: list[MarketProduct]):
         Args:
             market_products (list[MarketProduct]): The products to be traded.
         """
+        if not self.all_orders:
+            logger.warning(
+                f"[{self.context.current_timestamp}] The order book for market {self.marketconfig.market_id} with products {market_products} is empty. No orders were found."
+            )
+            return
+
         try:
             (accepted_orderbook, rejected_orderbook, market_meta, flows) = self.clear(
                 self.all_orders, market_products
@@ -670,12 +676,7 @@ async def clear_market(self, market_products: list[MarketProduct]):
                 receiver_addr=agent,
             )
         # store order book in db agent
-        if not accepted_orderbook:
-            logger.warning(
-                f"{self.context.current_timestamp} Market result {market_products} for market {self.marketconfig.market_id} are empty!"
-            )
-        all_orders = accepted_orderbook + rejected_orderbook
-        await self.store_order_book(all_orders)
+        await self.store_order_book(accepted_orderbook + rejected_orderbook)
 
         for meta in market_meta:
             logger.debug(