dikaioai
diff --git a/‎packages/clerk-js/src/core/clerk.ts‎
Lines changed: 12 additions & 9 deletions b/‎packages/clerk-js/src/core/clerk.ts‎
Lines changed: 12 additions & 9 deletions
@@ -493,9 +493,10 @@ export default class Clerk implements ClerkInterface {
     }
 
     this.session = session;
-    this.organization = (this.session?.user.organizationMemberships || [])
-      .map(om => om.organization)
-      .find(org => org.id === this.session?.lastActiveOrganizationId);
+    this.organization =
+      (this.session?.user.organizationMemberships || [])
+        .map(om => om.organization)
+        .find(org => org.id === this.session?.lastActiveOrganizationId) || null;
     this.user = this.session ? this.session.user : null;
 
     this.#emit();
@@ -903,19 +904,21 @@ export default class Clerk implements ClerkInterface {
         (this.#options.selectInitialSession
           ? this.#options.selectInitialSession(newClient)
           : this.#defaultSession(newClient)) || null;
-      this.organization = (this.session?.user.organizationMemberships || [])
-        .map(om => om.organization)
-        .find(org => org.id === this.session?.lastActiveOrganizationId);
+      this.organization =
+        (this.session?.user.organizationMemberships || [])
+          .map(om => om.organization)
+          .find(org => org.id === this.session?.lastActiveOrganizationId) || null;
       this.user = this.session ? this.session.user : null;
     }
     this.client = newClient;
 
     if (this.session) {
       const lastId = this.session.id;
       this.session = newClient.activeSessions.find(x => x.id === lastId);
-      this.organization = (this.session?.user.organizationMemberships || [])
-        .map(om => om.organization)
-        .find(org => org.id === this.session?.lastActiveOrganizationId);
+      this.organization =
+        (this.session?.user.organizationMemberships || [])
+          .map(om => om.organization)
+          .find(org => org.id === this.session?.lastActiveOrganizationId) || null;
       this.user = this.session ? this.session.user : null;
     }