diff --git a/packages/web/app/src/pages/organization.tsx b/packages/web/app/src/pages/organization.tsx
index a32fa3da52..1961c8eca0 100644
--- a/packages/web/app/src/pages/organization.tsx
+++ b/packages/web/app/src/pages/organization.tsx
@@ -348,10 +348,6 @@ function OrganizationPageContent(
       });
   }, [projectsConnection, props.search, sortKey, sortOrder]);
 
-  if (query.error) {
-    return <QueryError organizationSlug={props.organizationSlug} error={query.error} />;
-  }
-
   const onSearchChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
       void router.navigate({
@@ -392,6 +388,10 @@ function OrganizationPageContent(
     });
   }, [router, props.sortOrder]);
 
+  if (query.error) {
+    return <QueryError organizationSlug={props.organizationSlug} error={query.error} />;
+  }
+
   return (
     <OrganizationLayout
       page={Page.Overview}
diff --git a/packages/web/app/src/pages/project.tsx b/packages/web/app/src/pages/project.tsx
index 28ffce9113..8c690080ca 100644
--- a/packages/web/app/src/pages/project.tsx
+++ b/packages/web/app/src/pages/project.tsx
@@ -304,16 +304,6 @@ const ProjectsPageContent = (
     return 100;
   }, [targetConnection?.edges]);
 
-  if (query.error) {
-    return (
-      <QueryError
-        organizationSlug={props.organizationSlug}
-        error={query.error}
-        showLogoutButton={false}
-      />
-    );
-  }
-
   const onSearchChange = useCallback(
     (event: ChangeEvent<HTMLInputElement>) => {
       void router.navigate({
@@ -354,6 +344,16 @@ const ProjectsPageContent = (
     });
   }, [router, props.sortOrder]);
 
+  if (query.error) {
+    return (
+      <QueryError
+        organizationSlug={props.organizationSlug}
+        error={query.error}
+        showLogoutButton={false}
+      />
+    );
+  }
+
   return (
     <div className="grow">
       <div className="flex flex-row items-center justify-between py-6">