diff --git a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-flow-strategy.ts b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-flow-strategy.ts
index 4184cf2c8d..594e6e5c89 100644
--- a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-flow-strategy.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-flow-strategy.ts
@@ -78,12 +78,11 @@ export abstract class AuthFlowStrategy {
     return this.oAuthService
       .loadDiscoveryDocument()
       .then(() => {
-        const expireDate = this.oAuthService.getAccessTokenExpiration();
-        const currentDate = new Date().getTime();
-        if (expireDate > currentDate || this.oAuthService.getRefreshToken()) {
-          return this.refreshToken();
+        if (this.oAuthService.hasValidAccessToken() || !this.oAuthService.getRefreshToken()) {
+          return Promise.resolve();
         }
-        return Promise.resolve();
+
+        return this.refreshToken();
       })
       .catch(this.catchError);
   }