diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
index 054fb9bae1..bcaf31e1da 100644
--- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
+++ b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
@@ -29,6 +29,8 @@ public class HttpServletRequestExtractAdapter
     if (attribute instanceof String) {
       return (String) attribute;
     }
-    return carrier.getHeader(key);
+    String s = carrier.getHeader(key);
+    if (s == null) return null;
+    return s.split(",")[0].trim();
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java
index e8b1fff393..889482e06c 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java
+++ b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletRequestExtractAdapter.java
@@ -29,6 +29,8 @@ public class HttpServletRequestExtractAdapter
     if (attribute instanceof String) {
       return (String) attribute;
     }
-    return carrier.getHeader(key);
+    String s = carrier.getHeader(key);
+    if (s == null) return null;
+    return s.split(",")[0].trim();
   }
 }