diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
index 1f3eccab66b..eddf5020f74 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/TPEHelper.java
@@ -101,7 +101,7 @@ public static AgentScope getAndClearThreadLocalScope(Runnable task) {
       return null;
     }
     AgentScope scope = threadLocalScope.get();
-    threadLocalScope.set(null);
+    threadLocalScope.remove();
     return scope;
   }