diff --git a/swh/storage/replay.py b/swh/storage/replay.py
--- a/swh/storage/replay.py
+++ b/swh/storage/replay.py
@@ -115,12 +115,16 @@
         for content in objects:
             c = BaseContent.from_dict(content)
             if isinstance(c, SkippedContent):
+                logger.warning(
+                    "Received a series of skipped_content in the "
+                    "content topic, this should not happen any more"
+                )
                 skipped_contents.append(c)
             else:
                 contents.append(c)
         collision_aware_content_add(storage.skipped_content_add, skipped_contents)
         collision_aware_content_add(storage.content_add_metadata, contents)
-    if object_type == "skipped_content":
+    elif object_type == "skipped_content":
         skipped_contents = [SkippedContent.from_dict(obj) for obj in objects]
         collision_aware_content_add(storage.skipped_content_add, skipped_contents)
     elif object_type in ("origin_visit", "origin_visit_status"):