diff --git a/transfer_queue/client.py b/transfer_queue/client.py
index bd1e57b..52f9202 100644
--- a/transfer_queue/client.py
+++ b/transfer_queue/client.py
@@ -478,8 +478,9 @@ async def async_clear_samples(self, metadata: BatchMeta):
             # Clear the controller metadata
             await self._clear_meta_in_controller(metadata)
 
-            # Clear storage unit data
-            await self.storage_manager.clear_data(metadata)
+            # Clear storage unit data (skip if no fields, e.g. tag-only entries)
+            if metadata.field_names:
+                await self.storage_manager.clear_data(metadata)
 
             logger.debug(f"[{self.client_id}]: Clear operation for batch {metadata} completed.")
         except Exception as e: