diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index 4c4efc2f62b..01dc409bc3c 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -425,6 +425,20 @@ describe('AuthService test', () => {
       expect(result).toBe(true);
     });
 
+    it('should return false when getToken() returns null (example: cleared storage)', () => {
+      spyOn(authService, 'getToken').and.returnValue(null);
+      const result = authService.isTokenExpired();
+      expect(result).toBe(false);
+      expect(typeof result).toBe('boolean');
+    });
+
+    it('should return false when getToken() returns undefined (example: uninitialized store)', () => {
+      spyOn(authService, 'getToken').and.returnValue(undefined);
+      const result = authService.isTokenExpired();
+      expect(result).toBe(false);
+      expect(typeof result).toBe('boolean');
+    });
+
     it('should save token into storage', () => {
       authService.storeToken(token);
       expect(storage.set).toHaveBeenCalled();
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index a762c857626..4fbfeaa0876 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -482,7 +482,7 @@ export class AuthService {
    */
   public isTokenExpired(token?: AuthTokenInfo): boolean {
     token = token || this.getToken();
-    return token && token.expires < Date.now();
+    return !!token && token.expires < Date.now();
   }
 
   /**