diff --git a/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java b/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java
index 69c51482b2..4a9c1b5b80 100644
--- a/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java
+++ b/src/main/java/org/opensearch/security/action/onbehalf/CreateOnBehalfOfTokenAction.java
@@ -128,9 +128,7 @@ public void accept(RestChannel channel) throws Exception {
 
                     final String service = (String) requestBody.getOrDefault("service", "self-issued");
                     final User user = threadPool.getThreadContext().getTransient(ConfigConstants.OPENDISTRO_SECURITY_USER);
-                    final TransportAddress caller = threadPool.getThreadContext()
-                        .getTransient(ConfigConstants.OPENDISTRO_SECURITY_REMOTE_ADDRESS);
-                    Set<String> mappedRoles = mapRoles(user, caller);
+                    Set<String> mappedRoles = mapRoles(user, null);
 
                     builder.startObject();
                     builder.field("user", user.getName());