diff --git a/packages/web/src/app/[domain]/components/errorNavIndicator.tsx b/packages/web/src/app/[domain]/components/errorNavIndicator.tsx
index cf26ba56..a63a469d 100644
--- a/packages/web/src/app/[domain]/components/errorNavIndicator.tsx
+++ b/packages/web/src/app/[domain]/components/errorNavIndicator.tsx
@@ -95,6 +95,7 @@ export const ErrorNavIndicator = () => {
                             <div className="flex flex-col gap-2">
                                 {repos
                                     .slice(0, 10)
+                                    .filter(item => item.linkedConnections.length > 0) // edge case: don't show repos that are orphaned and awaiting gc.
                                     .map(repo => (
                                         // Link to the first connection for the repo
                                         <Link key={repo.repoId} href={`/${domain}/connections/${repo.linkedConnections[0].id}`} onClick={() => captureEvent('wa_error_nav_job_pressed', {})}>
diff --git a/packages/web/src/app/[domain]/components/progressNavIndicator.tsx b/packages/web/src/app/[domain]/components/progressNavIndicator.tsx
index 3bb40d6a..7d79d7bc 100644
--- a/packages/web/src/app/[domain]/components/progressNavIndicator.tsx
+++ b/packages/web/src/app/[domain]/components/progressNavIndicator.tsx
@@ -48,17 +48,21 @@ export const ProgressNavIndicator = () => {
                             The following repositories are currently being indexed:
                         </p>
                         <div className="flex flex-col gap-2 pl-4">
-                            {inProgressRepos.slice(0, 10).map(item => (
-                                // Link to the first connection for the repo
-                                <Link key={item.repoId} href={`/${domain}/connections/${item.linkedConnections[0].id}`} onClick={() => captureEvent('wa_progress_nav_job_pressed', {})}>
-                                    <div className="flex items-center gap-2 px-3 py-2 bg-green-50 dark:bg-green-900/20 
-                                                rounded-md text-sm text-green-700 dark:text-green-300 
-                                                border border-green-200/50 dark:border-green-800/50
-                                                hover:bg-green-100 dark:hover:bg-green-900/30 transition-colors">
-                                        <span className="font-medium truncate">{item.repoName}</span>
-                                    </div>
-                                </Link>
-                            ))}
+                            {
+                                inProgressRepos.slice(0, 10)
+                                .filter(item => item.linkedConnections.length > 0) // edge case: don't show repos that are orphaned and awaiting gc.
+                                .map(item => (
+                                    // Link to the first connection for the repo
+                                    <Link key={item.repoId} href={`/${domain}/connections/${item.linkedConnections[0].id}`} onClick={() => captureEvent('wa_progress_nav_job_pressed', {})}>
+                                        <div className="flex items-center gap-2 px-3 py-2 bg-green-50 dark:bg-green-900/20 
+                                                    rounded-md text-sm text-green-700 dark:text-green-300 
+                                                    border border-green-200/50 dark:border-green-800/50
+                                                    hover:bg-green-100 dark:hover:bg-green-900/30 transition-colors">
+                                            <span className="font-medium truncate">{item.repoName}</span>
+                                        </div>
+                                    </Link>
+                                )
+                            )}
                             {inProgressRepos.length > 10 && (
                                 <div className="text-sm text-green-600/90 dark:text-green-300/90 pl-3 pt-1">
                                     And {inProgressRepos.length - 10} more...