diff --git a/apps/web/app/(all)/[workspaceSlug]/(projects)/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(projects)/layout.tsx
index c780c8aad..e4d8d7627 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(projects)/layout.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(projects)/layout.tsx
@@ -3,27 +3,23 @@
 import { observer } from "mobx-react";
 import { Outlet } from "react-router";
 import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider";
-import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
 // plane web components
-import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
 import { ProjectAppSidebar } from "./_sidebar";
 
 function WorkspaceLayout() {
   return (
-    <AuthenticationWrapper>
+    <>
       <ProjectsAppPowerKProvider />
-      <WorkspaceAuthWrapper>
-        <div className="relative flex flex-col h-full w-full overflow-hidden rounded-lg border border-custom-border-200">
-          <div id="full-screen-portal" className="inset-0 absolute w-full" />
-          <div className="relative flex size-full overflow-hidden">
-            <ProjectAppSidebar />
-            <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
-              <Outlet />
-            </main>
-          </div>
+      <div className="relative flex flex-col h-full w-full overflow-hidden rounded-lg border border-custom-border-200">
+        <div id="full-screen-portal" className="inset-0 absolute w-full" />
+        <div className="relative flex size-full overflow-hidden">
+          <ProjectAppSidebar />
+          <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
+            <Outlet />
+          </main>
         </div>
-      </WorkspaceAuthWrapper>
-    </AuthenticationWrapper>
+      </div>
+    </>
   );
 }
 
diff --git a/apps/web/app/(all)/[workspaceSlug]/(settings)/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/(settings)/layout.tsx
index ea1745d75..2a5eda4f3 100644
--- a/apps/web/app/(all)/[workspaceSlug]/(settings)/layout.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/(settings)/layout.tsx
@@ -5,27 +5,23 @@ import { Outlet } from "react-router";
 import { ContentWrapper } from "@/components/core/content-wrapper";
 import { ProjectsAppPowerKProvider } from "@/components/power-k/projects-app-provider";
 import { SettingsHeader } from "@/components/settings/header";
-import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
-import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
 
 export default function SettingsLayout() {
   return (
-    <AuthenticationWrapper>
-      <WorkspaceAuthWrapper>
-        <ProjectsAppPowerKProvider />
-        <div className="relative flex h-full w-full overflow-hidden rounded-lg border border-custom-border-200">
-          <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
-            {/* Header */}
-            <SettingsHeader />
-            {/* Content */}
-            <ContentWrapper className="p-page-x md:flex w-full">
-              <div className="w-full h-full overflow-hidden">
-                <Outlet />
-              </div>
-            </ContentWrapper>
-          </main>
-        </div>
-      </WorkspaceAuthWrapper>
-    </AuthenticationWrapper>
+    <>
+      <ProjectsAppPowerKProvider />
+      <div className="relative flex h-full w-full overflow-hidden rounded-lg border border-custom-border-200">
+        <main className="relative flex h-full w-full flex-col overflow-hidden bg-custom-background-100">
+          {/* Header */}
+          <SettingsHeader />
+          {/* Content */}
+          <ContentWrapper className="p-page-x md:flex w-full">
+            <div className="w-full h-full overflow-hidden">
+              <Outlet />
+            </div>
+          </ContentWrapper>
+        </main>
+      </div>
+    </>
   );
 }
diff --git a/apps/web/app/(all)/[workspaceSlug]/layout.tsx b/apps/web/app/(all)/[workspaceSlug]/layout.tsx
index 22f1be8a9..945c0724b 100644
--- a/apps/web/app/(all)/[workspaceSlug]/layout.tsx
+++ b/apps/web/app/(all)/[workspaceSlug]/layout.tsx
@@ -2,14 +2,20 @@
 
 import { Outlet } from "react-router";
 import { AppRailProvider } from "@/hooks/context/app-rail-context";
+import { AuthenticationWrapper } from "@/lib/wrappers/authentication-wrapper";
 import { WorkspaceContentWrapper } from "@/plane-web/components/workspace/content-wrapper";
+import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
 
 export default function WorkspaceLayout() {
   return (
-    <AppRailProvider>
-      <WorkspaceContentWrapper>
-        <Outlet />
-      </WorkspaceContentWrapper>
-    </AppRailProvider>
+    <AuthenticationWrapper>
+      <WorkspaceAuthWrapper>
+        <AppRailProvider>
+          <WorkspaceContentWrapper>
+            <Outlet />
+          </WorkspaceContentWrapper>
+        </AppRailProvider>
+      </WorkspaceAuthWrapper>
+    </AuthenticationWrapper>
   );
 }