diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
 swh.core >= 0.0.75
 swh.model >= 0.0.60
 swh.scheduler
-swh.storage >= 0.0.178
+swh.storage >= 0.0.183
diff --git a/swh/loader/package/loader.py b/swh/loader/package/loader.py
--- a/swh/loader/package/loader.py
+++ b/swh/loader/package/loader.py
@@ -325,6 +325,7 @@
                         revision_id = self._load_revision(p_info, origin)
                         status_load = 'eventful'
                     except Exception as e:
+                        self.storage.clear_buffers()
                         load_exceptions.append(e)
                         sentry_sdk.capture_exception(e)
                         logger.exception('Failed loading branch %s for %s',
@@ -435,6 +436,8 @@
 
         self.storage.revision_add([revision])
 
+        if hasattr(self.storage, 'flush'):
+            self.storage.flush()
         return revision.id
 
     def _load_snapshot(