diff --git a/web/src/compositions/useRepos.ts b/web/src/compositions/useRepos.ts
index d094a847b..b34133348 100644
--- a/web/src/compositions/useRepos.ts
+++ b/web/src/compositions/useRepos.ts
@@ -26,12 +26,14 @@ export default function useRepos() {
   }
 
   function sortReposByLastAccess(repos: Repo[]): Repo[] {
-    return repos.sort((a, b) => {
-      const aLastAccess = lastAccess.value.get(a.id) ?? 0;
-      const bLastAccess = lastAccess.value.get(b.id) ?? 0;
+    return repos
+      .filter((r) => lastAccess.value.get(r.id) !== undefined)
+      .sort((a, b) => {
+        const aLastAccess = lastAccess.value.get(a.id)!;
+        const bLastAccess = lastAccess.value.get(b.id)!;
 
-      return bLastAccess - aLastAccess;
-    });
+        return bLastAccess - aLastAccess;
+      });
   }
 
   function sortReposByLastActivity(repos: Repo[]): Repo[] {
diff --git a/web/src/views/Repos.vue b/web/src/views/Repos.vue
index dfa03c800..749e8d1cd 100644
--- a/web/src/views/Repos.vue
+++ b/web/src/views/Repos.vue
@@ -10,7 +10,10 @@
 
     <Transition name="fade" mode="out-in">
       <div v-if="search === '' && repos.length > 0" class="grid gap-8">
-        <div v-if="reposLastAccess.length > 0" class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-2">
+        <div
+          v-if="reposLastAccess.length > 0 && repos.length > 4"
+          class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-2"
+        >
           <RepoItem v-for="repo in reposLastAccess" :key="repo.id" :repo="repo" />
         </div>