diff --git a/components/wso2is.key.manager.tokenpersistence/src/main/java/org/wso2/is/key/manager/tokenpersistence/utils/TokenMgtUtil.java b/components/wso2is.key.manager.tokenpersistence/src/main/java/org/wso2/is/key/manager/tokenpersistence/utils/TokenMgtUtil.java
index b9130071..1305fb95 100644
--- a/components/wso2is.key.manager.tokenpersistence/src/main/java/org/wso2/is/key/manager/tokenpersistence/utils/TokenMgtUtil.java
+++ b/components/wso2is.key.manager.tokenpersistence/src/main/java/org/wso2/is/key/manager/tokenpersistence/utils/TokenMgtUtil.java
@@ -219,6 +219,7 @@ private static AuthenticatedUser resolveAuthenticatedUserFromEntityId(String ent
                 String userName = userStoreManager.getUserNameFromUserID(entityId);
                 if (StringUtils.isNotBlank(userName)) {
                     authenticatedUser = OAuth2Util.getUserFromUserName(userName);
+                    authenticatedUser.setTenantDomain(TokenMgtUtil.getTenantDomain());
                     authenticatedUser.setUserId(entityId);
                 }
             } catch (UserStoreException e) {