diff --git a/swh/loader/core/loader.py b/swh/loader/core/loader.py
--- a/swh/loader/core/loader.py
+++ b/swh/loader/core/loader.py
@@ -236,11 +236,10 @@
         """
         raise NotImplementedError
 
-    def store_data(self):
-        """Store fetched data in the database.
+    def store_data(self, create_snapshot: bool = False):
+        """Store fetched data in the database. The create_snapshot boolean should help in
+        deciding whether to create the snapshot or not.
 
-        Should call the :func:`maybe_load_xyz` methods, which handle the
-        bundles sent to storage, rather than send directly.
         """
         raise NotImplementedError
 
@@ -336,7 +335,8 @@
 
             while True:
                 more_data_to_fetch = self.fetch_data()
-                self.store_data()
+                # no more data to fetch so it's sound to build a snapshot
+                self.store_data(create_snapshot=not more_data_to_fetch)
                 if not more_data_to_fetch:
                     break
 
@@ -440,7 +440,7 @@
         """Whether the load was eventful"""
         raise NotImplementedError
 
-    def store_data(self) -> None:
+    def store_data(self, create_snapshot: bool = False) -> None:
         assert self.origin
         if self.save_data_path:
             self.save_data()
@@ -462,7 +462,9 @@
         if self.has_releases():
             for release in self.get_releases():
                 self.storage.release_add([release])
-        snapshot = self.get_snapshot()
-        self.storage.snapshot_add([snapshot])
-        self.flush()
-        self.loaded_snapshot_id = snapshot.id
+
+        if create_snapshot:
+            snapshot = self.get_snapshot()
+            self.storage.snapshot_add([snapshot])
+            self.flush()
+            self.loaded_snapshot_id = snapshot.id
diff --git a/swh/loader/core/tests/test_loader.py b/swh/loader/core/tests/test_loader.py
--- a/swh/loader/core/tests/test_loader.py
+++ b/swh/loader/core/tests/test_loader.py
@@ -73,7 +73,7 @@
 
     """
 
-    def store_data(self):
+    def store_data(self, create_snapshot: bool = False):
         pass