diff --git a/apps/web/app/setup/organization/create/page.tsx b/apps/web/app/setup/organization/create/page.tsx
index 1e70843b9e..9d883bb37d 100644
--- a/apps/web/app/setup/organization/create/page.tsx
+++ b/apps/web/app/setup/organization/create/page.tsx
@@ -10,6 +10,7 @@ import { gethasNoOrganizations } from "@formbricks/lib/instance/service";
 import { getOrganizationsByUserId } from "@formbricks/lib/organization/service";
 import { getUser } from "@formbricks/lib/user/service";
 import { AuthenticationError } from "@formbricks/types/errors";
+import { ClientLogout } from "@formbricks/ui/components/ClientLogout";
 import { CreateOrganization } from "./components/CreateOrganization";
 
 export const metadata: Metadata = {
@@ -25,7 +26,7 @@ const Page = async () => {
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new Error(t("common.user_not_found"));
+    return <ClientLogout />;
   }
 
   const hasNoOrganizations = await gethasNoOrganizations();