diff --git a/__snapshots__/repo-header--long-name.png b/__snapshots__/repo-header--long-name.png
index 2a26ddb..8f52052 100644
Binary files a/__snapshots__/repo-header--long-name.png and b/__snapshots__/repo-header--long-name.png differ
diff --git a/__snapshots__/repo-header--no-name.png b/__snapshots__/repo-header--no-name.png
index b9daccd..9350095 100644
Binary files a/__snapshots__/repo-header--no-name.png and b/__snapshots__/repo-header--no-name.png differ
diff --git a/__snapshots__/repo-header.test.js.snap b/__snapshots__/repo-header.test.js.snap
index 44d7b92..c9f246a 100644
--- a/__snapshots__/repo-header.test.js.snap
+++ b/__snapshots__/repo-header.test.js.snap
@@ -18,7 +18,7 @@ exports[`Repo/Header No Name smoke-test 1`] = `
     <a href="/repo/9ee507fc4357d7ee16a5d8901bedcd103f23c17d"
        class="strong btn btn-ghost mb-0 mt-0 break-words px-3 text-sm"
     >
-      Untitled
+      9ee507fc4357d7ee16a5d8901bedcd103f23c17d
     </a>
   </div>
 </div>
diff --git a/src/lib/components/RepoSummaryCard.svelte b/src/lib/components/RepoSummaryCard.svelte
index 183ba07..fd26c7e 100644
--- a/src/lib/components/RepoSummaryCard.svelte
+++ b/src/lib/components/RepoSummaryCard.svelte
@@ -6,9 +6,12 @@
     summary_defaults
   let short_name: string
   $: {
-    if (name.length > 45) short_name = name.slice(0, 45) + '...'
-    else if (name.length == 0) short_name = 'Untitled'
-    else short_name = name
+    if (name && name.length > 45) short_name = name.slice(0, 45) + '...'
+    else if (name && name.length >= 0) short_name = name
+    else if (identifier && identifier.length > 45)
+      short_name = identifier.slice(0, 45) + '...'
+    else if (identifier && identifier.length >= 0) short_name = identifier
+    else short_name = 'Untitled'
   }
   $: short_descrption =
     description.length > 50 ? description.slice(0, 45) + '...' : description
diff --git a/src/lib/components/repo/RepoHeader.svelte b/src/lib/components/repo/RepoHeader.svelte
index a523876..9570c96 100644
--- a/src/lib/components/repo/RepoHeader.svelte
+++ b/src/lib/components/repo/RepoHeader.svelte
@@ -19,9 +19,12 @@
   } = event_defaults
   let short_name: string
   $: {
-    if (name.length > 45) short_name = name.slice(0, 45) + '...'
-    else if (name.length == 0) short_name = 'Untitled'
-    else short_name = name
+    if (name && name.length > 45) short_name = name.slice(0, 45) + '...'
+    else if (name && name.length >= 0) short_name = name
+    else if (identifier && identifier.length > 45)
+      short_name = identifier.slice(0, 45) + '...'
+    else if (identifier && identifier.length >= 0) short_name = identifier
+    else short_name = 'Untitled'
   }
 </script>