From 0705350a89c10f3de8d37cbcd5d36e4fc5dce710 Mon Sep 17 00:00:00 2001
From: Kent Wang <kent.wang@konghq.com>
Date: Thu, 11 Jun 2026 04:29:19 +0800
Subject: [PATCH] fix: catch organization list fetch error in loader (#10058)

---
 ...nization.$organizationId.project.$projectId.tsx | 14 +++++++++-----
 ...organization.$organizationId.project._index.tsx | 10 +++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
index 53dc8b5b04..a2cd8c9ad8 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project.$projectId.tsx
@@ -79,14 +79,18 @@ export async function clientLoader({ params }: Route.ClientLoaderArgs) {
     return redirect(href('/organization/:organizationId', { organizationId }));
   }
 
-  const organization = await services.organization.get(organizationId);
+  try {
+    const organization = await services.organization.get(organizationId);
 
-  if (accountId && organization && models.organization.isPersonalOrganization(organization)) {
-    const firstPersonalOrgLandingKey = `firstPersonalOrgLandingHandled:${accountId}`;
+    if (accountId && organization && models.organization.isPersonalOrganization(organization)) {
+      const firstPersonalOrgLandingKey = `firstPersonalOrgLandingHandled:${accountId}`;
 
-    if (!window.localStorage.getItem(firstPersonalOrgLandingKey)) {
-      window.localStorage.setItem(firstPersonalOrgLandingKey, 'true');
+      if (!window.localStorage.getItem(firstPersonalOrgLandingKey)) {
+        window.localStorage.setItem(firstPersonalOrgLandingKey, 'true');
+      }
     }
+  } catch (error) {
+    console.log('[organizations] Failed to load Organizations', error);
   }
 
   const fallbackLearningFeature = {
diff --git a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
index 69195ebb0d..5db91c969d 100644
--- a/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
+++ b/packages/insomnia/src/routes/organization.$organizationId.project._index.tsx
@@ -33,9 +33,13 @@ const shouldAutoCreateInitialProject = async ({
     return false;
   }
 
-  const organization = await services.organization.get(organizationId);
-
-  if (!organization || !models.organization.isPersonalOrganization(organization)) {
+  try {
+    const organization = await services.organization.get(organizationId);
+    if (!organization || !models.organization.isPersonalOrganization(organization)) {
+      return false;
+    }
+  } catch (error) {
+    console.log('[organizations] Failed to load Organizations', error);
     return false;
   }