diff --git a/packages/core/client/src/application/RouterManager.tsx b/packages/core/client/src/application/RouterManager.tsx
index 2468bf5130..80ea253209 100644
--- a/packages/core/client/src/application/RouterManager.tsx
+++ b/packages/core/client/src/application/RouterManager.tsx
@@ -19,6 +19,7 @@ import {
   RouteObject,
   useRoutes,
 } from 'react-router-dom';
+import VariablesProvider from '../variables/VariablesProvider';
 import { Application } from './Application';
 import { CustomRouterContextProvider } from './CustomRouterContextProvider';
 import { BlankComponent, RouterContextCleaner } from './components';
@@ -146,8 +147,10 @@ export class RouterManager {
           <ReactRouter {...opts}>
             <CustomRouterContextProvider>
               <BaseLayout>
-                <RenderRoutes />
-                {children}
+                <VariablesProvider>
+                  <RenderRoutes />
+                  {children}
+                </VariablesProvider>
               </BaseLayout>
             </CustomRouterContextProvider>
           </ReactRouter>
diff --git a/packages/core/client/src/route-switch/antd/admin-layout/index.tsx b/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
index 2557af79b6..acbf4bedd9 100644
--- a/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
+++ b/packages/core/client/src/route-switch/antd/admin-layout/index.tsx
@@ -38,7 +38,6 @@ import { Plugin } from '../../../application/Plugin';
 import { useAppSpin } from '../../../application/hooks/useAppSpin';
 import { useMenuTranslation } from '../../../schema-component/antd/menu/locale';
 import { Help } from '../../../user/Help';
-import { VariablesProvider } from '../../../variables';
 
 const filterByACL = (schema, options) => {
   const { allowAll, allowMenuItemIds = [] } = options;
@@ -508,9 +507,7 @@ export const AdminProvider = (props) => {
       <NavigateIfNotSignIn>
         <RemoteSchemaTemplateManagerProvider>
           <RemoteCollectionManagerProvider>
-            <VariablesProvider>
-              <ACLRolesCheckProvider>{props.children}</ACLRolesCheckProvider>
-            </VariablesProvider>
+            <ACLRolesCheckProvider>{props.children}</ACLRolesCheckProvider>
           </RemoteCollectionManagerProvider>
         </RemoteSchemaTemplateManagerProvider>
       </NavigateIfNotSignIn>