diff --git a/src/App.tsx b/src/App.tsx
index 4561d2a44fbb56d3ef437a1b288ea2ec4fe2b78a..97ec59250d3867d440e43dd113debbfbf3458040 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -14,7 +14,6 @@ import Register from "@/pages/Register";
 import UserProvider from "@/utils/context/AuthProvider";
 import Profile from "@/pages/Profile";
 import Gym from "@/pages/Gym";
-import GymProvider from "./utils/context/GymProvider";
 
 const queryClient = new QueryClient();
 const router = createBrowserRouter(
@@ -38,9 +37,7 @@ function App() {
   return (
     <QueryClientProvider client={queryClient}>
       <UserProvider>
-        <GymProvider>
-          <RouterProvider router={router} />
-        </GymProvider>
+        <RouterProvider router={router} />
       </UserProvider>
     </QueryClientProvider>
   );
diff --git a/src/components/ProtectedLayout.tsx b/src/components/ProtectedLayout.tsx
index 8cc504c4d6680a6c368e1034c6db85454a94fa0b..7e5f4c7849f54d175d6b6740d745cf2cd176fa1a 100644
--- a/src/components/ProtectedLayout.tsx
+++ b/src/components/ProtectedLayout.tsx
@@ -1,5 +1,6 @@
 import NavWrapper from "@/components/NavWrapper";
 import { useUser } from "@/utils/context/AuthProvider";
+import GymProvider from "@/utils/context/GymProvider";
 import { useEffect, useState } from "react";
 import { useNavigate, Outlet } from "react-router-dom";
 
@@ -27,7 +28,9 @@ function ProtectedLayout() {
 
   return (
     <NavWrapper>
-      <Outlet />
+      <GymProvider>
+        <Outlet />
+      </GymProvider>
     </NavWrapper>
   );
 }