diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java
index c9846a89cb..0be7c485eb 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstructionsView.java
@@ -172,7 +172,7 @@ public class DBTraceInstructionsView extends AbstractBaseDBTraceDefinedUnitsView
 			if (ctxSpace == null) {
 				return;
 			}
-			ctxSpace.setValue(language, null, tasr.getLifespan(), tasr.getRange());
+			ctxSpace.removeValue(language, contextReg, tasr.getLifespan(), tasr.getRange());
 			return;
 		}
 		DBTraceRegisterContextSpace ctxSpace = ctxMgr.get(space, true);