diff --git a/src/components/portal/portal-ticket-list.tsx b/src/components/portal/portal-ticket-list.tsx
index cd8f3de..70d21f6 100644
--- a/src/components/portal/portal-ticket-list.tsx
+++ b/src/components/portal/portal-ticket-list.tsx
@@ -145,7 +145,13 @@ export function PortalTicketList() {
     setFilters(defaultPortalTicketFilters)
   }
 
-  const isLoading = Boolean(authLoading || machineContextLoading || (viewerId && ticketsRaw === undefined))
+  const hasAuthContext = Boolean(session || machineContext)
+  const isLoading = Boolean(
+    authLoading ||
+      machineContextLoading ||
+      (hasAuthContext && !viewerId) ||
+      (viewerId && ticketsRaw === undefined)
+  )
 
   if (isLoading) {
     return (