diff --git a/src/app/(pages)/dashboard/onboarding/page.tsx b/src/app/(pages)/dashboard/onboarding/page.tsx
index 51aa9a2..4a7ee94 100644
--- a/src/app/(pages)/dashboard/onboarding/page.tsx
+++ b/src/app/(pages)/dashboard/onboarding/page.tsx
@@ -14,7 +14,7 @@ const OnboardingPage = (): ReactElement => {
         (state: UserState) => state.user
     );
     return (
-        <main className="min-h-screen flex justify-center items-center">
+        <main className="w-full min-h-screen flex justify-center items-center">
             {hasFlag(user as User, UserFlag.COMPLETED_ONBOARDING) ? (
                 <CompletedOnboarding />
             ) : (
diff --git a/src/components/dashboard/sidebar/sidebar.tsx b/src/components/dashboard/sidebar/sidebar.tsx
index 9a40409..d8326b7 100644
--- a/src/components/dashboard/sidebar/sidebar.tsx
+++ b/src/components/dashboard/sidebar/sidebar.tsx
@@ -1,26 +1,39 @@
+"use client";
+
 import { ReactElement } from "react";
 import Branding from "@/components/branding";
 import { Separator } from "@/components/ui/separator";
 import Link from "next/link";
 import OrganizationSelector from "@/components/dashboard/sidebar/organization-selector";
 import Links from "@/components/dashboard/sidebar/links";
+import { User } from "@/app/types/user/user";
+import { useUserContext } from "@/app/provider/user-provider";
+import { UserState } from "@/app/store/user-store";
+import { hasFlag } from "@/lib/user";
+import { UserFlag } from "@/app/types/user/user-flag";
 
-const Sidebar = (): ReactElement => (
-    <nav className="w-56 px-3 py-4 h-screen flex flex-col items-center bg-zinc-900 border-r">
-        {/* Header */}
-        <Link className="flex gap-3 items-center group" href="/dashboard">
-            <Branding size="xs" />
-            <h1 className="text-xl font-bold group-hover:opacity-75 transition-all transform-gpu">
-                Pulse App
-            </h1>
-        </Link>
-        <Separator className="w-32 my-3.5" />
-
-        {/* Content */}
-        <OrganizationSelector />
-        <Links />
-        <div className="mt-auto">USER</div>
-    </nav>
-);
+const Sidebar = (): ReactElement => {
+    const user: User | undefined = useUserContext(
+        (state: UserState) => state.user
+    );
+    return hasFlag(user as User, UserFlag.COMPLETED_ONBOARDING) ? (
+        <nav className="w-56 px-3 py-4 h-screen flex flex-col items-center bg-zinc-900 border-r">
+            {/* Header */}
+            <Link className="flex gap-3 items-center group" href="/dashboard">
+                <Branding size="xs" />
+                <h1 className="text-xl font-bold group-hover:opacity-75 transition-all transform-gpu">
+                    Pulse App
+                </h1>
+            </Link>
+            <Separator className="w-32 my-3.5" />
 
+            {/* Content */}
+            <OrganizationSelector />
+            <Links />
+            <div className="mt-auto">USER</div>
+        </nav>
+    ) : (
+        <div />
+    );
+};
 export default Sidebar;