diff --git a/src/context/auth.tsx b/src/context/auth.tsx
index 9980fe2d..0170ef33 100644
--- a/src/context/auth.tsx
+++ b/src/context/auth.tsx
@@ -51,53 +51,50 @@ const AuthProvider = ({ children }: AuthProviderProps) => {
     const navigate = useNavigate();
     axios.defaults.withCredentials = true;
 
-    // Function to handle logout
     const logoutUser = () => {
         dispatch({ type: 'LOGOUT' });
         window.localStorage.removeItem('user');
         navigate('/login');
     };
 
-    // Function to check token expiration
     const checkTokenExpiration = (token: string) => {
-        if (!token || typeof token !== 'string') {
-            console.warn("Invalid token provided for decoding");
-            logoutUser();
-            return;
-        }
+        if (!token) return;
+
         try {
             const decodedToken: any = jwtDecode(token);
             const currentTime = Date.now();
-            const tokenExpiryTime = decodedToken.exp * 1000; // Convert to milliseconds
+            const tokenExpiryTime = decodedToken.exp * 1000;
 
             if (tokenExpiryTime > currentTime) {
-                setTimeout(logoutUser, tokenExpiryTime - currentTime); // Auto-logout when token expires
+                // Set a timeout for auto-logout when the token expires
+                setTimeout(logoutUser, tokenExpiryTime - currentTime);
             } else {
                 logoutUser(); // Immediately logout if token is expired
             }
         } catch (error) {
             console.error("Error decoding token:", error);
-            logoutUser(); // Logout on error
+            logoutUser();
         }
     };
 
-
     useEffect(() => {
         const storedUser = window.localStorage.getItem('user');
         if (storedUser) {
             const userData = JSON.parse(storedUser);
             dispatch({ type: 'LOGIN', payload: userData });
-            checkTokenExpiration(userData.token); // Check if token is still valid
+
+            // Run expiration check only if a token exists
+            if (userData.token) {
+                checkTokenExpiration(userData.token);
+            }
         }
-    }, []);
+    }, []); // Only run this effect once on mount
 
     axios.interceptors.response.use(
-        function (response) {
-            return response;
-        },
-        function (error) {
+        (response) => response,
+        (error) => {
             const res = error.response;
-            if (res.status === 401 && res.config && !res.config.__isRetryRequest) {
+            if (res?.status === 401 && !res.config.__isRetryRequest) {
                 return new Promise((resolve, reject) => {
                     axios
                         .get(`${apiUrl}/auth/logout`)
@@ -122,4 +119,4 @@ const AuthProvider = ({ children }: AuthProviderProps) => {
     );
 };
 
-export { AuthContext, AuthProvider };
\ No newline at end of file
+export { AuthContext, AuthProvider };