diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java
index 2ff54fb5063..c174599c8c6 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java
@@ -144,7 +144,7 @@ private void updateTokenMessageContext(OAuthTokenReqMessageContext tokenMessageC
 
         tokenMessageContext.setScope(responseAccessToken.getScopes().toArray(new String[0]));
 
-        String expiresInClaimName = CLAIMS_PATH_PREFIX + AccessToken.ClaimNames.EXPIRES_IN.getName();
+        String expiresInClaimName = AccessToken.ClaimNames.EXPIRES_IN.getName();
         responseAccessToken.getClaims().stream()
                 .filter(claim -> expiresInClaimName.equals(claim.getName()))
                 .findFirst()
@@ -533,10 +533,8 @@ private OperationExecutionResult replaceExpiresIn(PerformableOperation operation
         }
 
         responseAccessToken.getClaims().removeIf(
-                claim -> claim.getName()
-                        .equals(CLAIMS_PATH_PREFIX + AccessToken.ClaimNames.EXPIRES_IN.getName()));
-        responseAccessToken.addClaim(CLAIMS_PATH_PREFIX + AccessToken.ClaimNames.EXPIRES_IN.getName(),
-                expiresIn);
+                claim -> claim.getName().equals(AccessToken.ClaimNames.EXPIRES_IN.getName()));
+        responseAccessToken.addClaim(AccessToken.ClaimNames.EXPIRES_IN.getName(), expiresIn);
         return new OperationExecutionResult(operation, OperationExecutionResult.Status.SUCCESS,
                 "Expiry time updated.");
     }