diff --git a/client/contexts/AuthContext.tsx b/client/contexts/AuthContext.tsx
index d9728dfa..6890dd07 100644
--- a/client/contexts/AuthContext.tsx
+++ b/client/contexts/AuthContext.tsx
@@ -339,17 +339,11 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
         });
 
       // Don't wait for rolesPromise - continue immediately
-      // Always set loading to false, even if role fetching hasn't completed
-      setTimeout(() => {
-        setLoading(false);
-      }, 100);
+      setLoading(false);
       return userProfile;
     } catch (error) {
       console.error("Error fetching user profile:", error);
-      // Always set loading to false even on error
-      setTimeout(() => {
-        setLoading(false);
-      }, 100);
+      setLoading(false);
       return null;
     }
   };