diff --git a/src/pages/ui/services/router.tsx b/src/pages/ui/services/router.tsx
index 3e35814..2db2b5a 100644
--- a/src/pages/ui/services/router.tsx
+++ b/src/pages/ui/services/router.tsx
@@ -1,7 +1,6 @@
 import { Outlet, Route, Routes } from "react-router-dom";
 import ServicesTopbar from "./components/Topbar";
 import ServicesList from "./components/ServicesList";
-import { ServicesProvider } from "./context/ServicesContext";
 import ServiceForm from "./components/ServiceForm";
 import FDLForm from "./components/FDL";
 import ServiceLogs from "./components/ServiceLogs";
@@ -12,20 +11,18 @@ function ServicesRouter() {
       <Route
         path="/"
         element={
-          <ServicesProvider>
-            <div
-              style={{
-                flexGrow: 1,
-                flexBasis: 0,
-                display: "flex",
-                flexDirection: "column",
-              }}
-            >
-              <ServicesTopbar />
-              <FDLForm />
-              <Outlet />
-            </div>
-          </ServicesProvider>
+          <div
+            style={{
+              flexGrow: 1,
+              flexBasis: 0,
+              display: "flex",
+              flexDirection: "column",
+            }}
+          >
+            <ServicesTopbar />
+            <FDLForm />
+            <Outlet />
+          </div>
         }
       >
         <Route path="" element={<ServicesList />} />
diff --git a/src/routes/router.tsx b/src/routes/router.tsx
index 7ca4a71..07be026 100644
--- a/src/routes/router.tsx
+++ b/src/routes/router.tsx
@@ -8,6 +8,7 @@ import TermsOfUse from "@/pages/TermsOfUse";
 import { MinioProvider } from "@/contexts/Minio/MinioContext";
 import MinioRouter from "@/pages/ui/minio/router";
 import InfoView from "@/pages/ui/info";
+import { ServicesProvider } from "@/pages/ui/services/context/ServicesContext";
 
 function AppRouter() {
   return (
@@ -17,9 +18,11 @@ function AppRouter() {
           path="/ui"
           element={
             <ProtectedRoute>
-              <MinioProvider>
-                <AppLayout />
-              </MinioProvider>
+              <ServicesProvider>
+                <MinioProvider>
+                  <AppLayout />
+                </MinioProvider>
+              </ServicesProvider>
             </ProtectedRoute>
           }
         >