diff --git a/web/app/home/page.tsx b/web/app/home/page.tsx
index aed25364..ba4320df 100644
--- a/web/app/home/page.tsx
+++ b/web/app/home/page.tsx
@@ -77,13 +77,13 @@ export default function Home() {
     [recommended, controls, backCardControls],
   );
 
-  if (recommended == null) {
+  if (data === undefined) {
     return <FullScreenCircularProgress />;
   }
   if (currentUser == null) {
     return <FullScreenCircularProgress />;
   }
-  if (displayedUser == null) {
+  if (recommended.size() === 0) {
     return <NoMoreUser />;
   }
   if (error) throw error;
@@ -173,4 +173,7 @@ class Queue<T> {
   pop(): T | undefined {
     return this.store.shift();
   }
+  size(): number {
+    return this.store.length;
+  }
 }