diff --git a/docs/injectables/OAuthService.html b/docs/injectables/OAuthService.html
index 2d816ab6..37d1f2d6 100644
--- a/docs/injectables/OAuthService.html
+++ b/docs/injectables/OAuthService.html
@@ -860,8 +860,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1986"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1986</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1984"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1984</a></div>
                 </td>
             </tr>
 
@@ -1174,8 +1174,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="2110"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:2110</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="2108"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:2108</a></div>
                 </td>
             </tr>
 
@@ -1287,8 +1287,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="2120"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:2120</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="2118"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:2118</a></div>
                 </td>
             </tr>
 
@@ -1562,8 +1562,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="2180"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:2180</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="2178"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:2178</a></div>
                 </td>
             </tr>
 
@@ -1739,8 +1739,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="2078"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:2078</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="2076"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:2076</a></div>
                 </td>
             </tr>
 
@@ -2088,8 +2088,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1905"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1905</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1903"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1903</a></div>
                 </td>
             </tr>
 
@@ -2131,8 +2131,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1921"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1921</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1919"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1919</a></div>
                 </td>
             </tr>
 
@@ -2175,8 +2175,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1928"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1928</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1926"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1926</a></div>
                 </td>
             </tr>
 
@@ -2216,8 +2216,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1878"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1878</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1876"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1876</a></div>
                 </td>
             </tr>
 
@@ -2259,8 +2259,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1867"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1867</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1865"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1865</a></div>
                 </td>
             </tr>
 
@@ -2302,8 +2302,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1889"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1889</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1887"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1887</a></div>
                 </td>
             </tr>
 
@@ -2345,8 +2345,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1940"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1940</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1938"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1938</a></div>
                 </td>
             </tr>
 
@@ -2389,8 +2389,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1932"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1932</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1930"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1930</a></div>
                 </td>
             </tr>
 
@@ -2430,8 +2430,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1911"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1911</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1909"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1909</a></div>
                 </td>
             </tr>
 
@@ -2719,8 +2719,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1951"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1951</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1949"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1949</a></div>
                 </td>
             </tr>
 
@@ -2762,8 +2762,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1968"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1968</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1966"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1966</a></div>
                 </td>
             </tr>
 
@@ -2805,8 +2805,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="2150"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:2150</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="2148"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:2148</a></div>
                 </td>
             </tr>
 
@@ -3165,8 +3165,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="2135"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:2135</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="2133"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:2133</a></div>
                 </td>
             </tr>
 
@@ -3638,8 +3638,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1996"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1996</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1994"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1994</a></div>
                 </td>
             </tr>
 
@@ -3714,8 +3714,8 @@ <h3 id="methods">
 
             <tr>
                 <td class="col-md-4">
-                    <div class="io-line">Defined in <a href="" data-line="1895"
-                            class="link-to-prism">projects/lib/src/oauth-service.ts:1895</a></div>
+                    <div class="io-line">Defined in <a href="" data-line="1893"
+                            class="link-to-prism">projects/lib/src/oauth-service.ts:1893</a></div>
                 </td>
             </tr>
 
@@ -9787,20 +9787,8 @@ <h3 id="inputs">
             loadKeys: () &#x3D;&gt; this.loadJwks()
         };
 
-
-        return this.checkAtHash(validationParams)
-          .then(atHashValid &#x3D;&gt; {
-            if (
-              !this.disableAtHashCheck &amp;&amp;
-              this.requestAccessToken &amp;&amp;
-              !atHashValid
-          ) {
-              const err &#x3D; &#x27;Wrong at_hash&#x27;;
-              this.logger.warn(err);
-              return Promise.reject(err);
-          }
-
           return this.checkSignature(validationParams).then(_ &#x3D;&gt; {
+          const atHashCheckEnabled &#x3D; !this.disableAtHashCheck;
               const result: ParsedIdToken &#x3D; {
                   idToken: idToken,
                   idTokenClaims: claims,
@@ -9809,9 +9797,19 @@ <h3 id="inputs">
                   idTokenHeaderJson: headerJson,
                   idTokenExpiresAt: expiresAtMSec
               };
+          if(atHashCheckEnabled) {
+            return this.checkAtHash(validationParams).then(atHashValid &#x3D;&gt; {
+              if(this.requestAccessToken &amp;&amp; !atHashValid) {
+                const err &#x3D; &#x27;Wrong at_hash&#x27;;
+                this.logger.warn(err);
+                return Promise.reject(err);
+              } else {
               return result;
+              }
           });
-
+          } else {
+            return result;
+          }
         });
     }
 
diff --git a/projects/lib/src/oauth-service.ts b/projects/lib/src/oauth-service.ts
index 0f618437..71d95d21 100644
--- a/projects/lib/src/oauth-service.ts
+++ b/projects/lib/src/oauth-service.ts
@@ -1864,6 +1864,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
             idTokenHeader: header,
             loadKeys: () => this.loadJwks()
         };
+
         if(this.disableAtHashCheck){
             return this.checkSignature(validationParams).then(_ => {
                 const result: ParsedIdToken = {
@@ -1890,7 +1891,9 @@ export class OAuthService extends AuthConfig implements OnDestroy {
               return Promise.reject(err);
           }
 
+
           return this.checkSignature(validationParams).then(_ => {
+          const atHashCheckEnabled = !this.disableAtHashCheck;
               const result: ParsedIdToken = {
                   idToken: idToken,
                   idTokenClaims: claims,
@@ -1899,9 +1902,19 @@ export class OAuthService extends AuthConfig implements OnDestroy {
                   idTokenHeaderJson: headerJson,
                   idTokenExpiresAt: expiresAtMSec
               };
+          if(atHashCheckEnabled) {
+            return this.checkAtHash(validationParams).then(atHashValid => {
+              if(this.requestAccessToken && !atHashValid) {
+                const err = 'Wrong at_hash';
+                this.logger.warn(err);
+                return Promise.reject(err);
+              } else {
               return result;
+              }
           });
-
+          } else {
+            return result;
+          }
         });
     }