diff --git a/openwpm/storage/storage_controller.py b/openwpm/storage/storage_controller.py
index 9175c6388..68c437a9e 100644
--- a/openwpm/storage/storage_controller.py
+++ b/openwpm/storage/storage_controller.py
@@ -216,6 +216,14 @@ async def finalize_visit_id(
         self.logger.info("Awaiting all tasks for visit_id %d", visit_id)
         for task in self.store_record_tasks[visit_id]:
             await task
+
+        if visit_id not in self.store_record_tasks:
+            self.logger.error(
+                "visit_id %d, is already awaited, skipping...",
+                visit_id,
+            )
+            return None
+
         del self.store_record_tasks[visit_id]
         self.logger.debug(
             "Awaited all tasks for visit_id %d while finalizing", visit_id