diff --git a/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg-attach.py b/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg-attach.py
index b5845cfb89..e9348f8e64 100644
--- a/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg-attach.py
+++ b/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg-attach.py
@@ -67,8 +67,8 @@ def main():
     cmd.ghidra_trace_start(target)
     cmd.ghidra_trace_sync_enable()
 
-    cmd.ghidra_trace_txstart()
-    cmd.ghidra_trace_put_all()
+    with cmd.open_tracked_tx("PutAll"):
+        cmd.ghidra_trace_put_all()
 
     cmd.repl()
 
diff --git a/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg.py b/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg.py
index 9222e660b7..8828e0df40 100644
--- a/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg.py
+++ b/Ghidra/Debug/Debugger-agent-x64dbg/data/support/local-x64dbg.py
@@ -84,11 +84,11 @@ def main():
     cmd.ghidra_trace_start(target)
     cmd.ghidra_trace_sync_enable()   
 
-    cmd.ghidra_trace_txstart()
-    if target is None or target == "":
-        cmd.ghidra_trace_put_available()
-    else:
-        cmd.ghidra_trace_put_all()
+    with cmd.open_tracked_tx("PutAll"):
+        if target is None or target == "":
+            cmd.ghidra_trace_put_available()
+        else:
+            cmd.ghidra_trace_put_all()
 
     cmd.repl()