diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy
index b49a9a2bfb7..bd4906cbdc9 100644
--- a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy
@@ -101,7 +101,7 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
     def type = id & 1 ? "p" : "f"
     String url = address.resolve("/injected-id/${type}ing/$id")
     def traceId = totalInvocations + id
-    def request = new Request.Builder().url(url).get().header("x-datadog-trace-id", traceId.toString()).build()
+    def request = new Request.Builder().url(url).get().addHeader("x-datadog-trace-id", traceId.toString()).addHeader("x-datadog-parent-id", "1").build()
     def response = client.newCall(request).execute()
     def responseBodyStr = response.body().string()
     assert responseBodyStr == "${type}ong $id -> $traceId"
diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
index 397de4f2613..1b2eb0b022f 100644
--- a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
@@ -99,7 +99,7 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
     def type = id & 1 ? "p" : "f"
     String url = address.resolve("/injected-id/${type}ing/$id")
     def traceId = totalInvocations + id
-    def request = new Request.Builder().url(url).get().header("x-datadog-trace-id", traceId.toString()).build()
+    def request = new Request.Builder().url(url).get().addHeader("x-datadog-trace-id", traceId.toString()).addHeader("x-datadog-parent-id", "1").build()
     def response = client.newCall(request).execute()
     def responseBodyStr = response.body().string()
     assert responseBodyStr == "${type}ong $id -> $traceId"
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy
index 664ee4f0e7f..00ec4300261 100644
--- a/dd-java-agent/instrumentation/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy
@@ -56,7 +56,7 @@ abstract class PekkoHttpServerInstrumentationTest extends HttpServerTest<PekkoHt
     def type = id & 1 ? "p" : "f"
     String url = address.resolve("/injected-id/${type}ing/$id")
     def traceId = totalInvocations + id
-    def request = new Request.Builder().url(url).get().header("x-datadog-trace-id", traceId.toString()).build()
+    def request = new Request.Builder().url(url).get().addHeader("x-datadog-trace-id", traceId.toString()).addHeader("x-datadog-parent-id", "1").build()
     def response = client.newCall(request).execute()
     def responseBodyStr = response.body().string()
     assert responseBodyStr == "${type}ong $id -> $traceId"
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
index 0b2b3c9c721..0b94cdaee34 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/ContextInterpreter.java
@@ -246,7 +246,7 @@ public ContextInterpreter reset(TraceConfig traceConfig) {
 
   protected TagContext build() {
     if (valid) {
-      if (fullContext && !DDTraceId.ZERO.equals(traceId)) {
+      if (fullContext && !DDTraceId.ZERO.equals(traceId) && DDSpanId.ZERO != spanId) {
         if (propagationTags == null) {
           propagationTags = propagationTagsFactory.empty();
         }
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy
index 62d07a03f06..fa62bd8b58a 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/core/propagation/DatadogHttpExtractorTest.groovy
@@ -355,11 +355,12 @@ class DatadogHttpExtractorTest extends DDSpecification {
     "-1"                  | "1"                   | null             | null
     "1"                   | "-1"                  | null             | null
     "0"                   | "1"                   | null             | null
-    "1"                   | "0"                   | DD64bTraceId.ONE | DDSpanId.ZERO
+    "1"                   | "0"                   | null             | null
     "$TRACE_ID_MAX"       | "1"                   | DD64bTraceId.MAX | 1
     "${TRACE_ID_MAX + 1}" | "1"                   | null             | null
     "1"                   | "$TRACE_ID_MAX"       | DD64bTraceId.ONE | DDSpanId.MAX
     "1"                   | "${TRACE_ID_MAX + 1}" | null             | null
+    "1"                   | "1"                   | DD64bTraceId.ONE | 1
   }
 
   def "extract http headers with end to end"() {
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy
index 716dec06ddf..1ef4f4c5ce7 100644
--- a/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy
+++ b/dd-trace-core/src/test/groovy/datadog/trace/lambda/LambdaHandlerTest.groovy
@@ -37,6 +37,7 @@ class LambdaHandlerTest extends DDCoreSpecification {
           response
             .status(200)
             .addHeader("x-datadog-trace-id", "1234")
+            .addHeader("x-datadog-parent-id", "1")
             .addHeader("x-datadog-sampling-priority", "2")
             .send()
         }
@@ -70,6 +71,7 @@ class LambdaHandlerTest extends DDCoreSpecification {
           response
             .status(200)
             .addHeader("x-datadog-trace-id", "5744042798732701615")
+            .addHeader("x-datadog-parent-id", "1")
             .addHeader("x-datadog-sampling-priority", "2")
             .addHeader("x-datadog-tags", "_dd.p.tid=1914fe7789eb32be")
             .send()