diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewPropertyMapManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewPropertyMapManager.java
index 3c67291caa..5ee78db255 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewPropertyMapManager.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/program/DBTraceProgramViewPropertyMapManager.java
@@ -50,9 +50,8 @@ public class DBTraceProgramViewPropertyMapManager implements PropertyMapManager
 
 		@Override
 		public void clear() {
-			AddressSetView view = getAddressSetView();
-			AddressRangeIterator addressRanges = view.getAddressRanges();
-			for (AddressRange range : addressRanges) {
+			AddressSet all = program.getAddressFactory().getAddressSet();
+			for (AddressRange range : all.getAddressRanges()) {
 				removeRange(range.getMinAddress(), range.getMaxAddress());
 			}
 		}