diff --git a/frontend/src/index.ts b/frontend/src/index.ts
index 11ffa9f1be..f159b684da 100644
--- a/frontend/src/index.ts
+++ b/frontend/src/index.ts
@@ -849,6 +849,11 @@ export class App extends BtrixElement {
 
       case "org": {
         if (!this.isUserInCurrentOrg) {
+          if (this.authState && !this.userInfo) {
+            // Wait for user info to finish loading
+            return this.renderSpinner();
+          }
+
           return this.renderNotFoundPage();
         }