diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index 6c44bd097..a691472c2 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -40,6 +40,7 @@ export default function App() {
     setSuccessOpen,
     setErrorData,
     loading,
+    setLoading
   } = useContext(alertContext);
   const navigate = useNavigate();
 
@@ -143,6 +144,7 @@ export default function App() {
           user['refresh_token'] = "auto";
           login(user['access_token'], user['refresh_token']);
           setAutoLogin(true);
+          setLoading(false);
         }
       }).catch((error) => {
         setAutoLogin(false);
@@ -150,6 +152,7 @@ export default function App() {
           getLoggedUser()
             .then((user) => {
               setUserData(user);
+              setLoading(false);
             })
             .catch((error) => {});
         }
diff --git a/src/frontend/src/routes.tsx b/src/frontend/src/routes.tsx
index a2c487b87..cd8f86c9a 100644
--- a/src/frontend/src/routes.tsx
+++ b/src/frontend/src/routes.tsx
@@ -5,6 +5,7 @@ import { ProtectedLoginRoute } from "./components/authLoginGuard";
 import { CatchAllRoute } from "./components/catchAllRoutes";
 import AdminPage from "./pages/AdminPage";
 import LoginAdminPage from "./pages/AdminPage/LoginPage";
+import ApiKeysPage from "./pages/ApiKeysPage";
 import CommunityPage from "./pages/CommunityPage";
 import FlowPage from "./pages/FlowPage";
 import HomePage from "./pages/MainPage";
@@ -12,7 +13,6 @@ import ViewPage from "./pages/ViewPage";
 import DeleteAccountPage from "./pages/deleteAccountPage";
 import LoginPage from "./pages/loginPage";
 import SignUp from "./pages/signUpPage";
-import ApiKeysPage from "./pages/ApiKeysPage";
 
 const Router = () => {
   return (
@@ -42,11 +42,14 @@ const Router = () => {
             </ProtectedRoute>
           }
         />
-        <Route path="view" element={
-                    <ProtectedRoute>
-                    <ViewPage />
-                  </ProtectedRoute>
-        } />
+        <Route
+          path="view"
+          element={
+            <ProtectedRoute>
+              <ViewPage />
+            </ProtectedRoute>
+          }
+        />
       </Route>
       <Route
         path="*"