diff --git a/transfer_queue/client.py b/transfer_queue/client.py
index 2c131a7..11caa3e 100644
--- a/transfer_queue/client.py
+++ b/transfer_queue/client.py
@@ -442,12 +442,12 @@ async def async_clear_partition(self, partition_id: str):
                 )
                 return
 
-            # Clear the controller metadata
-            await self._clear_partition_in_controller(partition_id)
-
             # Clear storage unit data
             await self.storage_manager.clear_data(metadata)
 
+            # Clear the controller metadata
+            await self._clear_partition_in_controller(partition_id)
+
             logger.debug(f"[{self.client_id}]: Clear operation for partition_id {partition_id} completed.")
         except Exception as e:
             raise RuntimeError(f"Error in clear operation: {str(e)}") from e
@@ -475,12 +475,12 @@ async def async_clear_samples(self, metadata: BatchMeta):
             if not self._controller:
                 raise RuntimeError("No controller registered")
 
-            # Clear the controller metadata
-            await self._clear_meta_in_controller(metadata)
-
             # Clear storage unit data
             await self.storage_manager.clear_data(metadata)
 
+            # Clear the controller metadata
+            await self._clear_meta_in_controller(metadata)
+
             logger.debug(f"[{self.client_id}]: Clear operation for batch {metadata} completed.")
         except Exception as e:
             raise RuntimeError(f"Error in clear_samples operation: {str(e)}") from e