diff --git a/client/src/App.tsx b/client/src/App.tsx
index 3b3321b7..7a951869 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -27,7 +27,7 @@ import './styles/custom.scss';
  * @returns {React.ReactNode} The rendered component.
  */
 function App(): React.ReactNode {
-  const { signed, checkCurrentAuthUser } = useContext(AuthContext);
+  const { signed, loading } = useContext(AuthContext);
   const [theme, setTheme] = useState(() => {
     return localStorage.getItem('theme') ?? 'light';
   });
@@ -114,10 +114,6 @@ function App(): React.ReactNode {
 
   const browserRouter = getBrowserRouter();
 
-  useEffect(() => {
-    checkCurrentAuthUser(window.location.pathname);
-  }, []);
-
   useEffect(() => {
     document.body.setAttribute('data-bs-theme', theme);
     localStorage.setItem('theme', theme);
@@ -138,7 +134,7 @@ function App(): React.ReactNode {
       </button>
 
       {/* Your routes or content here */}
-      <RouterProvider router={browserRouter} />
+      {!loading && <RouterProvider router={browserRouter} />}
     </>
   );
 };
diff --git a/client/src/__test__/__mocks__/authContextMock.ts b/client/src/__test__/__mocks__/authContextMock.ts
index 4b9b12dc..a13fc205 100644
--- a/client/src/__test__/__mocks__/authContextMock.ts
+++ b/client/src/__test__/__mocks__/authContextMock.ts
@@ -2,6 +2,7 @@ import { vi } from "vitest";
 
 const authContextMock = {
   signed: true,
+  loading: false,
   user: undefined,
   checkCurrentAuthUser: vi.fn(),
   signIn: vi.fn(),
diff --git a/client/src/__test__/context/AuthProvider.test.tsx b/client/src/__test__/context/AuthProvider.test.tsx
index b8fb5b9a..7487b5fc 100644
--- a/client/src/__test__/context/AuthProvider.test.tsx
+++ b/client/src/__test__/context/AuthProvider.test.tsx
@@ -15,6 +15,7 @@ vi.mock('../../api-service/api');
 const ConsumerComponent: React.FC = () => {
   const {
     signed,
+    loading,
     user,
     signIn,
     register,
@@ -26,6 +27,7 @@ const ConsumerComponent: React.FC = () => {
   return (
     <div>
       <div data-testid="signed">{signed ? 'true' : 'false'}</div>
+      <div data-testid="loading">{loading ? 'true' : 'false'}</div>
       <div data-testid="user">{user ? user.name : 'none'}</div>
       <button
         data-testid="signIn"
@@ -89,15 +91,57 @@ describe('AuthProvider', () => {
     cleanup();
   });
 
-  it('should render the default context values', () => {
+  it('should render the default context values', async () => {
     const { getByTestId } = render(
       <AuthProvider>
         <ConsumerComponent />
       </AuthProvider>
     );
 
+    await waitFor(() => {
+      expect(getByTestId('signed').textContent).toBe('false');
+      expect(getByTestId('user').textContent).toBe('none');
+    });
+  });
+
+  it('should set loading to false after initial auth check with no token', async () => {
+    // No token in localStorage, so fetchCurrentSession returns immediately.
+    const { getByTestId } = render(
+      <AuthProvider>
+        <ConsumerComponent />
+      </AuthProvider>
+    );
+
+    await waitFor(() =>
+      expect(getByTestId('loading').textContent).toBe('false')
+    );
     expect(getByTestId('signed').textContent).toBe('false');
-    expect(getByTestId('user').textContent).toBe('none');
+  });
+
+  it('should set loading to false and signed to true after successful initial auth check', async () => {
+    const fakeResponse = {
+      token: 'refresh-token',
+      userId: '789',
+      name: 'Refreshed User',
+      email: 'refreshed@example.com',
+      admin: false,
+      createdAt: new Date().toISOString(),
+      gravatarImageUrl: 'http://dummyimage.com'
+    };
+
+    vi.spyOn(api, 'getJSON').mockResolvedValue(fakeResponse);
+    localStorage.setItem(API_TOKEN, 'dummy');
+
+    const { getByTestId } = render(
+      <AuthProvider>
+        <ConsumerComponent />
+      </AuthProvider>
+    );
+
+    await waitFor(() =>
+      expect(getByTestId('loading').textContent).toBe('false')
+    );
+    expect(getByTestId('signed').textContent).toBe('true');
   });
 
   it('should sign in a user successfully', async () => {
diff --git a/client/src/context/AuthContext.ts b/client/src/context/AuthContext.ts
index 0a166918..751c7e3f 100644
--- a/client/src/context/AuthContext.ts
+++ b/client/src/context/AuthContext.ts
@@ -4,6 +4,7 @@ import { UserRegistration } from '../types/UserRegistration';
 
 export interface AuthContextData {
   signed: boolean;
+  loading: boolean;
   user: UserResponse | undefined;
   checkCurrentAuthUser: (pathname: string) => Promise<void>;
   signIn: (email: string, password: string) => Promise<string>;
diff --git a/client/src/context/AuthProvider.tsx b/client/src/context/AuthProvider.tsx
index 73b15c13..b8152e06 100644
--- a/client/src/context/AuthProvider.tsx
+++ b/client/src/context/AuthProvider.tsx
@@ -13,6 +13,7 @@ interface Props {
 
 const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Props) => {
   const [signed, setSigned] = useState<boolean>(false);
+  const [loading, setLoading] = useState<boolean>(true);
   const [user, setUser] = useState<UserResponse | undefined>();
   const [isAdmin, setIsAdmin] = useState<boolean>(false);
   const [intervalInstance, setIntervalInstance] = useState<NodeJS.Timeout | null>(null);
@@ -136,6 +137,12 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
   const minute = second * 60;
   const REFRESH_TIMER = minute * 2;
 
+  useEffect(() => {
+    checkCurrentAuthUser(window.location.pathname)
+      .catch(e => console.error(e))
+      .finally(() => setLoading(false));
+  }, []);
+
   useEffect(() => {
     if (signed && intervalInstance == null) {
       const instance = setInterval(() => {
@@ -163,6 +170,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
 
   const contextValue: AuthContextData = useMemo(() => ({
     signed,
+    loading,
     user,
     checkCurrentAuthUser,
     signIn,
@@ -170,7 +178,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }: Pro
     register,
     isAdmin,
     updateUser
-  }), [signed, user, checkCurrentAuthUser, signIn, signOut, register, isAdmin, updateUser]);
+  }), [signed, loading, user, checkCurrentAuthUser, signIn, signOut, register, isAdmin, updateUser]);
 
   return (
     <AuthContext.Provider value={contextValue}>