diff --git a/swh/indexer/indexer.py b/swh/indexer/indexer.py
--- a/swh/indexer/indexer.py
+++ b/swh/indexer/indexer.py
@@ -562,8 +562,8 @@
                    for o in ids]
 
         origins = []
-        for id_ in ids:
-            origin = self.storage.origin_get(self.origin_get_params(id_))
+        for (id_, origin) in zip(ids, self.storage.origin_get(
+                [self.origin_get_params(id_) for id_ in ids])):
             if not origin:
                 self.log.warning('Origin %s not found in storage' %
                                  id_)