diff --git a/projects/lib/src/interceptors/default-oauth.interceptor.ts b/projects/lib/src/interceptors/default-oauth.interceptor.ts
index a559420f..53f119e0 100644
--- a/projects/lib/src/interceptors/default-oauth.interceptor.ts
+++ b/projects/lib/src/interceptors/default-oauth.interceptor.ts
@@ -64,7 +64,10 @@ export class DefaultOAuthInterceptor implements HttpInterceptor {
     }
 
     return merge(
-      of(this.oAuthService.getAccessToken()).pipe(filter((token) => !!token)),
+      of(this.oAuthService.hasValidAccessToken()).pipe(
+        filter((hasValidToken) => hasValidToken),
+        map(() => this.oAuthService.getAccessToken())
+      ),
       this.oAuthService.events.pipe(
         filter((e) => e.type === 'token_received'),
         timeout(this.oAuthService.waitForTokenInMsec || 0),