diff --git a/swh/web/browse/snapshot_context.py b/swh/web/browse/snapshot_context.py
--- a/swh/web/browse/snapshot_context.py
+++ b/swh/web/browse/snapshot_context.py
@@ -796,6 +796,8 @@
         nb_dirs = len(dirs)
         dir_path = "/" + path
 
+    swh_objects = []
+    vault_cooking = {}
     revision_found = True
     if sha1_git is None and revision_id is not None:
         try:
@@ -803,11 +805,17 @@
         except NotFoundExc:
             revision_found = False
 
-    swh_objects = [
-        SWHObjectInfo(object_type=DIRECTORY, object_id=sha1_git),
-        SWHObjectInfo(object_type=REVISION, object_id=revision_id),
-        SWHObjectInfo(object_type=SNAPSHOT, object_id=snapshot_id),
-    ]
+    if sha1_git is not None:
+        swh_objects.append(SWHObjectInfo(object_type=DIRECTORY, object_id=sha1_git))
+        vault_cooking.update(
+            {"directory_context": True, "directory_swhid": f"swh:1:dir:{sha1_git}",}
+        )
+    if revision_found:
+        swh_objects.append(SWHObjectInfo(object_type=REVISION, object_id=revision_id))
+        vault_cooking.update(
+            {"revision_context": True, "revision_swhid": f"swh:1:rev:{revision_id}",}
+        )
+    swh_objects.append(SWHObjectInfo(object_type=SNAPSHOT, object_id=snapshot_id))
 
     visit_date = None
     visit_type = None
@@ -837,13 +845,6 @@
         visit_type=visit_type,
     )
 
-    vault_cooking = {
-        "directory_context": True,
-        "directory_swhid": f"swh:1:dir:{sha1_git}",
-        "revision_context": True,
-        "revision_swhid": f"swh:1:rev:{revision_id}",
-    }
-
     swhids_info = get_swhids_info(swh_objects, snapshot_context, dir_metadata)
 
     dir_path = "/".join([bc["name"] for bc in breadcrumbs]) + "/"
@@ -857,7 +858,7 @@
     )
 
     top_right_link = None
-    if not snapshot_context["is_empty"]:
+    if not snapshot_context["is_empty"] and revision_found:
         top_right_link = {
             "url": history_url,
             "icon": swh_object_icons["revisions history"],
diff --git a/swh/web/templates/includes/revision-info.html b/swh/web/templates/includes/revision-info.html
--- a/swh/web/templates/includes/revision-info.html
+++ b/swh/web/templates/includes/revision-info.html
@@ -5,7 +5,7 @@
 See top-level LICENSE file for more information
 {% endcomment %}
 
-{% if snapshot_context and snapshot_context.revision_id %}
+{% if snapshot_context and snapshot_context.revision_info %}
   <div id="swh-tip-revision" class="card d-none d-md-block">
     <div class="card-body pt-2 pb-1 d-flex align-items-start justify-content-between">
       <i style="min-width: 36px;" class="{{ swh_object_icons.revision }} mdi-36px mdi-fw" aria-hidden="true"></i>
diff --git a/swh/web/tests/browse/views/test_origin.py b/swh/web/tests/browse/views/test_origin.py
--- a/swh/web/tests/browse/views/test_origin.py
+++ b/swh/web/tests/browse/views/test_origin.py
@@ -821,6 +821,16 @@
         resp, f"Revision {unknown_revision } could not be found in the archive."
     )
 
+    # no revision card
+    assert_not_contains(resp, "swh-tip-revision")
+    # no Download dropdown
+    assert_not_contains(resp, "swh-vault-download")
+    # no History link
+    assert_not_contains(resp, "swh-tr-link")
+    # no SWHIDs for directory and revision
+    assert_not_contains(resp, "swh:1:dir:")
+    assert_not_contains(resp, "swh:1:rev:")
+
 
 @given(origin())
 def test_origin_content_no_path(client, origin):