diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java
index fd9e1143ae..26cc6d27a6 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/watch/DebuggerWatchesProvider.java
@@ -251,7 +251,13 @@ public class DebuggerWatchesProvider extends ComponentProviderAdapter
 		}
 
 		private void objectRestored(DomainObjectChangeRecord rec) {
-			addChanged(current.getView().getMemory());
+			for (AddressSpace space : current.getTrace()
+					.getBaseAddressFactory()
+					.getAllAddressSpaces()) {
+				if (space.isRegisterSpace() || space.isMemorySpace()) {
+					addChanged(new AddressRangeImpl(space.getMinAddress(), space.getMaxAddress()));
+				}
+			}
 		}
 
 		private void bytesChanged(TraceAddressSpace space, TraceAddressSnapRange range) {
@@ -390,13 +396,6 @@ public class DebuggerWatchesProvider extends ComponentProviderAdapter
 		changeDebouncer.addListener(__ -> doCheckDepsAndReevaluate());
 	}
 
-	private void addChanged(AddressSetView toAdd) {
-		synchronized (changed) {
-			changed.add(toAdd);
-			changeDebouncer.contact(null);
-		}
-	}
-
 	private void addChanged(AddressRange toAdd) {
 		synchronized (changed) {
 			changed.add(toAdd);