diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandler.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandler.java
index 8d1bb806b6..05bd3139ec 100644
--- a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandler.java
+++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/AuthorizationCodeGrantTypeHandler.java
@@ -153,7 +153,7 @@ public AccessToken handle(OAuth2Request request, ClientRegistration clientRegist
                 throw new InvalidGrantException("Authorization code expired.");
             }
 
-            if (providerSettings.isCodeVerifierRequired()) {
+            if (codeVerifier != null) {
                 checkCodeVerifier(authorizationCode, codeVerifier);
             }