diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
index 1537bbcf0..9c1c6158d 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextManager.java
@@ -168,6 +168,7 @@ public class ContextManager implements BootService {
     public static void stopSpan(AbstractSpan span) {
         if (get().stopSpan(span)) {
             CONTEXT.remove();
+            RUNTIME_CONTEXT.remove();
         }
     }