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
@@ -538,8 +538,8 @@
         "ov.date",
         "ov.type AS type",
         "ovs.status",
-        "ovs.metadata",
         "ovs.snapshot",
+        "ovs.metadata",
     ]
 
     origin_visit_status_select_cols = [
diff --git a/swh/storage/tests/storage_tests.py b/swh/storage/tests/storage_tests.py
--- a/swh/storage/tests/storage_tests.py
+++ b/swh/storage/tests/storage_tests.py
@@ -1916,7 +1916,9 @@
                             visit=visit.visit,
                             date=now(),
                             status="full",
-                            snapshot=None,
+                            snapshot=hash_to_bytes(
+                                "9b922e6d8d5b803c1582aabe5525b7b91150788e"
+                            ),
                         )
                     ]
                 )