diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py
index 36fcd91966..d57987601d 100644
--- a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py
+++ b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py
@@ -1416,15 +1416,13 @@ def put_processes():
 
 
 def put_state(event_process):
-    STATE.require_no_tx()
-    STATE.tx = STATE.require_trace().start_tx("state", undoable=False)
     ipath = PROCESS_PATTERN.format(procnum=event_process.GetProcessID())
-    procobj = STATE.trace.create_object(ipath)
-    state = "STOPPED" if event_process.is_stopped else "RUNNING"
-    procobj.set_value('_state', state)
-    procobj.insert()
-    STATE.require_tx().commit()
-    STATE.reset_tx()
+    with STATE.client.batch():
+        with STATE.require_trace().open_tx('State'):
+            procobj = STATE.trace.create_object(ipath)
+            state = "STOPPED" if event_process.is_stopped else "RUNNING"
+            procobj.set_value('_state', state)
+            procobj.insert()
 
 
 @convert_errors
diff --git a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java
index c6526c88d7..649300d9c0 100644
--- a/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java
+++ b/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbCommandsTest.java
@@ -243,7 +243,7 @@ public class GdbCommandsTest extends AbstractGdbTraceRmiTest {
 				quit
 				""".formatted(PREAMBLE));
 		assertEquals("""
-				Selected Ghidra language: DATA:LE:64:default
+				Selected Ghidra language: x86:LE:32:default
 				Selected Ghidra compiler: pointer64""",
 			extractOutSection(out, "---Import---"));
 		assertEquals("""