diff --git a/ui/src/auth/useOrganization.ts b/ui/src/auth/useOrganization.ts
index 2b8e50f..94c2030 100644
--- a/ui/src/auth/useOrganization.ts
+++ b/ui/src/auth/useOrganization.ts
@@ -26,6 +26,14 @@ export const useOrgStore = create<OrgState>((set, get) => ({
     const org = get().organizations.find((o) => o.id === orgId);
     set({ currentOrgId: orgId, currentTenantId: org?.tenantId ?? null });
   },
-  setOrganizations: (orgs) => set({ organizations: orgs }),
+  setOrganizations: (orgs) => {
+    const { currentOrgId } = get();
+    const match = currentOrgId ? orgs.find((o) => o.id === currentOrgId) : null;
+    set({
+      organizations: orgs,
+      // Re-resolve tenantId when org list is enriched (e.g., OrgResolver adds tenantId)
+      currentTenantId: match?.tenantId ?? get().currentTenantId,
+    });
+  },
   setIsPlatformAdmin: (value) => set({ isPlatformAdmin: value }),
 }));