diff --git a/components/context/src/main/java/datadog/context/InferredProxyContext.java b/components/context/src/main/java/datadog/context/InferredProxyContext.java
index 51eecc4cc02..9782adcb15e 100644
--- a/components/context/src/main/java/datadog/context/InferredProxyContext.java
+++ b/components/context/src/main/java/datadog/context/InferredProxyContext.java
@@ -9,6 +9,10 @@ public class InferredProxyContext implements ImplicitContextKeyed {
       ContextKey.named("inferred-proxy-key");
   private final Map<String, String> inferredProxy;
 
+  // at most 6 x-dd-proxy http headers to be extracted and stored into the Context hashmap,
+  // following API Gateway RFC
+  private final int DEFAULT_CAPACITY = 6;
+
   public static InferredProxyContext fromContext(Context context) {
     return context.get(CONTEXT_KEY);
   }
@@ -16,12 +20,12 @@ public static InferredProxyContext fromContext(Context context) {
   public InferredProxyContext(Map<String, String> contextInfo) {
     this.inferredProxy =
         (contextInfo == null || contextInfo.isEmpty())
-            ? new HashMap<>()
+            ? new HashMap<>(DEFAULT_CAPACITY)
             : new HashMap<>(contextInfo);
   }
 
   public InferredProxyContext() {
-    this.inferredProxy = new HashMap<>();
+    this.inferredProxy = new HashMap<>(DEFAULT_CAPACITY);
   }
 
   public Map<String, String> getInferredProxyContext() {
diff --git a/components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java b/components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java
index 69e5a0e896e..8b0c8b593e3 100644
--- a/components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java
+++ b/components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java
@@ -2,8 +2,6 @@
 
 import datadog.context.Context;
 import datadog.context.InferredProxyContext;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.BiConsumer;
 
 public class InferredProxyPropagator implements Propagator {
@@ -48,11 +46,6 @@ public static class InferredProxyContextExtractor implements BiConsumer<String,
 
     InferredProxyContextExtractor() {}
 
-    private Map<String, String> parseInferredProxyHeaders(String input) {
-      Map<String, String> parsedHeaders = new HashMap<>();
-      return parsedHeaders;
-    }
-
     /**
      * Performs this operation on the given arguments.
      *
@@ -64,7 +57,6 @@ public void accept(String key, String value) {
       if (key == null || key.isEmpty() || !key.startsWith(INFERRED_PROXY_KEY)) {
         return;
       }
-      Map<String, String> inferredProxyMap = parseInferredProxyHeaders(value);
       if (extractedContext == null) {
         extractedContext = new InferredProxyContext();
       }