diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py
index a6997f76f7..50106b3367 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py
@@ -174,7 +174,7 @@ def ghidra_trace_listen(address='0.0.0.0:0'):
         c, (chost, cport) = s.accept()
         s.close()
         print("Connection from {}:{}\n".format(chost, cport))
-        STATE.client = Client(c, methods.REGISTRY)
+        STATE.client = Client(c, "TBD", methods.REGISTRY)
     except ValueError:
         raise RuntimeError("port must be numeric")
 
diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py
index e218b87df6..521021d1e7 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py
@@ -240,7 +240,7 @@ def ghidra_trace_listen(address=None, *, is_mi, **kwargs):
         c, (chost, cport) = s.accept()
         s.close()
         gdb.write("Connection from {}:{}\n".format(chost, cport))
-        STATE.client = Client(c, methods.REGISTRY)
+        STATE.client = Client(c, "TBD", methods.REGISTRY)
     except ValueError:
         raise gdb.GdbError("port must be numeric")
 
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 b35857b5dc..b158fba5a8 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
@@ -191,7 +191,7 @@ def ghidra_trace_connect(debugger, command, result, internal_dict):
     try:
         c = socket.socket()
         c.connect((host, int(port)))
-        STATE.client = Client(c, methods.REGISTRY)
+        STATE.client = Client(c, "TBD", methods.REGISTRY)
     except ValueError:
         raise RuntimeError("port must be numeric")
 
@@ -228,7 +228,7 @@ def ghidra_trace_listen(debugger, command, result, internal_dict):
         c, (chost, cport) = s.accept()
         s.close()
         print("Connection from {}:{}\n".format(chost, cport))
-        STATE.client = Client(c, methods.REGISTRY)
+        STATE.client = Client(c, "TBD", methods.REGISTRY)
     except ValueError:
         raise RuntimeError("port must be numeric")