diff --git a/swh/indexer/origin_head.py b/swh/indexer/origin_head.py
--- a/swh/indexer/origin_head.py
+++ b/swh/indexer/origin_head.py
@@ -32,14 +32,16 @@
     # Dispatch
 
     def index(self, origin_url):
-        latest_visit = self.storage.origin_visit_get_latest(
-            origin_url, allowed_statuses=["full"], require_snapshot=True
+        visit = self.storage.origin_visit_get_latest(origin_url)
+        if visit is None:
+            return None
+        latest_snapshot = self.storage.snapshot_get_latest(
+            origin_url, allowed_statuses=["full"]
         )
-        if latest_visit is None:
+        if latest_snapshot is None:
             return None
-        latest_snapshot = self.storage.snapshot_get(latest_visit["snapshot"])
         method = getattr(
-            self, "_try_get_%s_head" % latest_visit["type"], self._try_get_head_generic
+            self, "_try_get_%s_head" % visit["type"], self._try_get_head_generic
         )
 
         rev_id = method(latest_snapshot)