diff --git a/swh/storage/postgresql/db.py b/swh/storage/postgresql/db.py
--- a/swh/storage/postgresql/db.py
+++ b/swh/storage/postgresql/db.py
@@ -515,7 +515,7 @@
         "o.url AS origin",
         "ovs.visit",
         "ovs.date",
-        "ovs.type",
+        "ov.type AS type",  # To remove when origin_visit_status.type is populated
         "ovs.status",
         "ovs.snapshot",
         "ovs.metadata",
@@ -548,6 +548,7 @@
             "SELECT %s" % ", ".join(self.origin_visit_status_select_cols),
             "FROM origin_visit_status ovs ",
             "INNER JOIN origin o ON o.id = ovs.origin",
+            "INNER JOIN origin_visit ov using (origin, visit)",
         ]
         query_parts.append("WHERE o.url = %s")
         query_params: List[Any] = [origin_url]
@@ -586,6 +587,7 @@
             f"SELECT {', '.join(self.origin_visit_status_select_cols)} "
             "FROM origin_visit_status ovs ",
             "INNER JOIN origin o ON o.id = ovs.origin ",
+            "INNER JOIN origin_visit ov using (origin, visit)",
         ]
         query_parts.append("WHERE o.url = %s AND ovs.visit = %s ")
         query_params: List[Any] = [origin, visit]
diff --git a/swh/storage/postgresql/storage.py b/swh/storage/postgresql/storage.py
--- a/swh/storage/postgresql/storage.py
+++ b/swh/storage/postgresql/storage.py
@@ -1084,6 +1084,7 @@
                 origin=row_d["origin"],
                 visit=row_d["visit"],
                 date=row_d["date"],
+                type=row_d["type"],
                 status=row_d["status"],
                 metadata=row_d["metadata"],
                 snapshot=row_d["snapshot"],