diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index 1c8274e63..1a7178248 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -103,13 +103,6 @@ export default function App() {
       if (isAuthenticated) {
         try {
           await setupAxiosDefaults();
-
-          const res = await getGlobalVariables();
-          setGlobalVariables(res);
-
-          checkHasStore();
-          fetchApiData();
-
           resolve();
         } catch (error) {
           console.error("Failed to fetch data:", error);
diff --git a/src/frontend/src/contexts/authContext.tsx b/src/frontend/src/contexts/authContext.tsx
index bd5c2d02c..76b3ba742 100644
--- a/src/frontend/src/contexts/authContext.tsx
+++ b/src/frontend/src/contexts/authContext.tsx
@@ -1,11 +1,13 @@
 import { createContext, useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import Cookies from "universal-cookie";
-import { getLoggedUser, requestLogout } from "../controllers/API";
+import { getGlobalVariables, getLoggedUser, requestLogout } from "../controllers/API";
 import useAlertStore from "../stores/alertStore";
 import { useFolderStore } from "../stores/foldersStore";
 import { Users } from "../types/api";
 import { AuthContextType } from "../types/contexts/auth";
+import { useGlobalVariablesStore } from "../stores/globalVariablesStore/globalVariables";
+import { useStoreStore } from "../stores/storeStore";
 
 const initialValue: AuthContextType = {
   isAdmin: false,
@@ -45,6 +47,11 @@ export function AuthProvider({ children }): React.ReactElement {
   );
 
   const getFoldersApi = useFolderStore((state) => state.getFoldersApi);
+  const setGlobalVariables = useGlobalVariablesStore(
+    (state) => state.setGlobalVariables,
+  );
+  const checkHasStore = useStoreStore((state) => state.checkHasStore);
+  const fetchApiData = useStoreStore((state) => state.fetchApiData);
 
   useEffect(() => {
     const storedAccessToken = cookies.get("access_token_lf");
@@ -66,8 +73,11 @@ export function AuthProvider({ children }): React.ReactElement {
         setUserData(user);
         const isSuperUser = user!.is_superuser;
         setIsAdmin(isSuperUser);
-
         getFoldersApi(true, true);
+        const res = await getGlobalVariables();
+        setGlobalVariables(res);
+        checkHasStore();
+        fetchApiData();
       })
       .catch((error) => {
         setLoading(false);