diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiTarget.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiTarget.java
index 673c3a444b..f4e0807698 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiTarget.java
+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiTarget.java
@@ -809,12 +809,14 @@ public class TraceRmiTarget extends AbstractTarget {
 
 		public MatchedMethod getBest(String name, ActionName action,
 				Supplier<List<? extends MethodMatcher>> preferredSupplier) {
-			return map.computeIfAbsent(name, n -> chooseBest(action, preferredSupplier.get()));
+			return getBest(name, action, preferredSupplier.get());
 		}
 
 		public MatchedMethod getBest(String name, ActionName action,
 				List<? extends MethodMatcher> preferred) {
-			return map.computeIfAbsent(name, n -> chooseBest(action, preferred));
+			synchronized (map) {
+				return map.computeIfAbsent(name, n -> chooseBest(action, preferred));
+			}
 		}
 
 		private MatchedMethod chooseBest(ActionName name, List<? extends MethodMatcher> preferred) {