diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetStackFrameRegisterContainer.java b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetStackFrameRegisterContainer.java
index 23cd7c4db7..6ff330f0a6 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetStackFrameRegisterContainer.java
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelTargetStackFrameRegisterContainer.java
@@ -88,13 +88,13 @@ public class GdbModelTargetStackFrameRegisterContainer
 			if (!valid) {
 				return;
 			}
-			if (regs.size() != registersByNumber.size()) {
-				allRegisters.clear();
-				registersByNumber.clear();
-			}
-			allRegisters.addAll(regs);
 			List<GdbModelTargetStackFrameRegister> registers;
 			synchronized (this) {
+				if (regs.size() != registersByNumber.size()) {
+					allRegisters.clear();
+					registersByNumber.clear();
+				}
+				allRegisters.addAll(regs);
 				registers = regs.stream().map(this::getTargetRegister).collect(Collectors.toList());
 			}
 			setElements(registers, Map.of(), "Refreshed");