diff --git a/space/app/issues/[anchor]/client-layout.tsx b/space/app/issues/[anchor]/client-layout.tsx
index b100e57c6f5..0e24ab55163 100644
--- a/space/app/issues/[anchor]/client-layout.tsx
+++ b/space/app/issues/[anchor]/client-layout.tsx
@@ -3,7 +3,7 @@
 import { observer } from "mobx-react";
 import useSWR from "swr";
 // components
-import { LogoSpinner } from "@/components/common";
+import { LogoSpinner, PoweredBy } from "@/components/common";
 import { IssuesNavbarRoot } from "@/components/issues";
 import { SomethingWentWrongError } from "@/components/issues/issue-layouts/error";
 // hooks
@@ -44,11 +44,14 @@ export const IssuesClientLayout = observer((props: Props) => {
   if (error) return <SomethingWentWrongError />;
 
   return (
-    <div className="relative flex h-screen min-h-[500px] w-screen flex-col overflow-hidden">
-      <div className="relative flex h-[60px] flex-shrink-0 select-none items-center border-b border-custom-border-300 bg-custom-sidebar-background-100">
-        <IssuesNavbarRoot publishSettings={publishSettings} />
+    <>
+      <div className="relative flex h-screen min-h-[500px] w-screen flex-col overflow-hidden">
+        <div className="relative flex h-[60px] flex-shrink-0 select-none items-center border-b border-custom-border-300 bg-custom-sidebar-background-100">
+          <IssuesNavbarRoot publishSettings={publishSettings} />
+        </div>
+        <div className="relative h-full w-full overflow-hidden bg-custom-background-90">{children}</div>
       </div>
-      <div className="relative h-full w-full overflow-hidden bg-custom-background-90">{children}</div>
-    </div>
+      <PoweredBy />
+    </>
   );
 });
diff --git a/space/app/views/[anchor]/layout.tsx b/space/app/views/[anchor]/layout.tsx
index 6f286efe2e8..57b2971c4c3 100644
--- a/space/app/views/[anchor]/layout.tsx
+++ b/space/app/views/[anchor]/layout.tsx
@@ -3,7 +3,7 @@
 import { observer } from "mobx-react";
 import useSWR from "swr";
 // components
-import { LogoSpinner } from "@/components/common";
+import { LogoSpinner, PoweredBy } from "@/components/common";
 import { SomethingWentWrongError } from "@/components/issues/issue-layouts/error";
 // hooks
 import { usePublish, usePublishList } from "@/hooks/store";
@@ -50,6 +50,7 @@ const IssuesLayout = observer((props: Props) => {
         <ViewNavbarRoot publishSettings={publishSettings} />
       </div>
       <div className="relative h-full w-full overflow-hidden bg-custom-background-90">{children}</div>
+      <PoweredBy />
     </div>
   );
 });
diff --git a/space/app/views/[anchor]/page.tsx b/space/app/views/[anchor]/page.tsx
index 21bb5a96574..1efd95a5337 100644
--- a/space/app/views/[anchor]/page.tsx
+++ b/space/app/views/[anchor]/page.tsx
@@ -2,6 +2,8 @@
 
 import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
+// components
+import { PoweredBy } from "@/components/common";
 // hooks
 import { usePublish } from "@/hooks/store";
 // plane-web
@@ -24,7 +26,12 @@ const IssuesPage = observer((props: Props) => {
 
   if (!publishSettings) return null;
 
-  return <ViewLayoutsRoot peekId={peekId} publishSettings={publishSettings} />;
+  return (
+    <>
+      <ViewLayoutsRoot peekId={peekId} publishSettings={publishSettings} />
+      <PoweredBy />
+    </>
+  );
 });
 
 export default IssuesPage;
diff --git a/space/core/components/account/user-logged-in.tsx b/space/core/components/account/user-logged-in.tsx
index 4bedc459643..0993ade9208 100644
--- a/space/core/components/account/user-logged-in.tsx
+++ b/space/core/components/account/user-logged-in.tsx
@@ -4,6 +4,7 @@ import { observer } from "mobx-react";
 import Image from "next/image";
 import { useTheme } from "next-themes";
 // components
+import { PoweredBy } from "@/components/common";
 import { UserAvatar } from "@/components/issues";
 // hooks
 import { useUser } from "@/hooks/store";
@@ -45,6 +46,7 @@ export const UserLoggedIn = observer(() => {
           </p>
         </div>
       </div>
+      <PoweredBy />
     </div>
   );
 });
diff --git a/space/core/components/views/auth.tsx b/space/core/components/views/auth.tsx
index d9dbbb3bc40..39d830a92a2 100644
--- a/space/core/components/views/auth.tsx
+++ b/space/core/components/views/auth.tsx
@@ -7,6 +7,7 @@ import { useTheme } from "next-themes";
 import { SPACE_BASE_PATH } from "@plane/constants";
 // components
 import { AuthRoot } from "@/components/account";
+import { PoweredBy } from "@/components/common";
 // images
 import PlaneBackgroundPatternDark from "@/public/auth/background-pattern-dark.svg";
 import PlaneBackgroundPattern from "@/public/auth/background-pattern.svg";
@@ -40,6 +41,7 @@ export const AuthView = observer(() => {
           <AuthRoot />
         </div>
       </div>
+      <PoweredBy />
     </div>
   );
 });
diff --git a/space/core/lib/instance-provider.tsx b/space/core/lib/instance-provider.tsx
index a09e5f9a6c4..06056364f37 100644
--- a/space/core/lib/instance-provider.tsx
+++ b/space/core/lib/instance-provider.tsx
@@ -8,7 +8,7 @@ import { useTheme } from "next-themes";
 import useSWR from "swr";
 import { SPACE_BASE_PATH } from "@plane/constants";
 // components
-import { LogoSpinner, PoweredBy } from "@/components/common";
+import { LogoSpinner } from "@/components/common";
 import { InstanceFailureView } from "@/components/instance";
 // hooks
 import { useInstance, useUser } from "@/hooks/store";
@@ -68,10 +68,5 @@ export const InstanceProvider = observer(({ children }: { children: ReactNode })
     );
   }
 
-  return (
-    <>
-      {children}
-      <PoweredBy />
-    </>
-  );
+  return children;
 });