diff --git a/src/main/java/org/opensearch/security/support/HeaderHelper.java b/src/main/java/org/opensearch/security/support/HeaderHelper.java
index a4ee123347..1a7484a781 100644
--- a/src/main/java/org/opensearch/security/support/HeaderHelper.java
+++ b/src/main/java/org/opensearch/security/support/HeaderHelper.java
@@ -27,7 +27,6 @@
 package org.opensearch.security.support;
 
 import java.io.Serializable;
-import java.util.Map;
 
 import com.google.common.base.Strings;
 
@@ -57,15 +56,8 @@ public static String getSafeFromHeader(final ThreadContext context, final String
             return null;
         }
 
-        String headerValue = null;
-        	
-        Map<String, String> headers = context.getHeaders();
-        if (!headers.containsKey(headerName) || (headerValue = headers.get(headerName)) == null) {
-            return null;
-        }
-
         if (isInterClusterRequest(context) || isTrustedClusterRequest(context) || isDirectRequest(context)) {
-            return headerValue;
+            return context.getHeader(headerName);
         }
 
         return null;