From 237834db3e6d9adeb22f124bcade59ac9eeaca8a Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Thu, 22 Jan 2026 01:42:04 +0100
Subject: [PATCH] fix: wait for org context before rendering dashboard

---
 app/page.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/page.tsx b/app/page.tsx
index b2df720..f018fa8 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -89,6 +89,11 @@ export default function HomePage() {
     )
   }
 
+  // * Wait for organization context before rendering SiteList to avoid "Organization Required" flash
+  if (user && !user.org_id) {
+    return <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Switching Context..." />
+  }
+
   return (
     <div className="mx-auto max-w-5xl p-6">
       <div className="mb-8 flex items-center justify-between">