diff --git a/frontend/src/app/(app)/layout.tsx b/frontend/src/app/(app)/layout.tsx
index 8ba5c33..ef8a52a 100644
--- a/frontend/src/app/(app)/layout.tsx
+++ b/frontend/src/app/(app)/layout.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useState } from "react";
-import { AuthProvider, useAuth } from "@/lib/auth";
+import { useAuth } from "@/lib/auth";
 import Sidebar from "@/components/Sidebar";
 import { useRouter } from "next/navigation";
 import { useEffect } from "react";
@@ -98,9 +98,5 @@ function TopNavbarUser() {
 }
 
 export default function AppLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <AuthProvider>
-      <AppShell>{children}</AppShell>
-    </AuthProvider>
-  );
+  return <AppShell>{children}</AppShell>;
 }
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
index 9115c00..3608d61 100644
--- a/frontend/src/app/layout.tsx
+++ b/frontend/src/app/layout.tsx
@@ -2,6 +2,7 @@ import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "bootstrap/dist/css/bootstrap.min.css";
 import "./globals.css";
+import { AuthProvider } from "@/lib/auth";
 
 const inter = Inter({
   variable: "--font-inter",
@@ -30,7 +31,9 @@ export default function RootLayout({
           href="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@300;400;500;600;700&display=swap"
         />
       </head>
-      <body style={{ fontFamily: "'Fira Sans', sans-serif" }}>{children}</body>
+      <body style={{ fontFamily: "'Fira Sans', sans-serif" }}>
+        <AuthProvider>{children}</AuthProvider>
+      </body>
     </html>
   );
 }