diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java
index 1205306589..0d51df4140 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java
@@ -495,26 +495,30 @@ public enum DBTraceUtils {
 			Map<R, V> toPut = new HashMap<>();
 			for (E entry : getIntersecting(prev, next)) {
 				R r = getRange(entry);
-				boolean precedesMin = getLower(r).compareTo(lower) < 0;
-				boolean succeedsMax = getUpper(r).compareTo(upper) > 0;
+				int cmpMin = getLower(r).compareTo(lower);
+				int cmpMax = getUpper(r).compareTo(upper);
 				boolean sameVal = Objects.equals(getValue(entry), value);
-				if (precedesMin && succeedsMax && sameVal) {
+				if (cmpMin <= 0 && cmpMax >= 0 && sameVal) {
 					return entry; // The value in this range is already set as specified
 				}
 				remove(entry);
-				if (precedesMin) {
+				if (cmpMin < 0) {
 					if (sameVal) {
+						// Expand the new entry to cover the one we just removed
 						lower = getLower(r);
 					}
 					else {
+						// Create a truncated entry to replace the one we just removed
 						toPut.put(toRange(getLower(r), prev), getValue(entry));
 					}
 				}
-				if (succeedsMax) {
+				if (cmpMax > 0) {
 					if (sameVal) {
+						// Expand the new entry to cover the one we just removed
 						upper = getUpper(r);
 					}
 					else {
+						// Create a truncated entry to replace the one we just removed
 						toPut.put(toRange(next, getUpper(r)), getValue(entry));
 					}
 				}
diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java
index 457005d806..e69f3494e5 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemorySpace.java
@@ -295,7 +295,9 @@ public class DBTraceMemorySpace
 		if (state == null) {
 			throw new NullPointerException();
 		}
-
+		var l = new Object() {
+			boolean changed;
+		};
 		new AddressRangeMapSetter<Entry<TraceAddressSnapRange, TraceMemoryState>, TraceMemoryState>() {
 			@Override
 			protected AddressRange getRange(Entry<TraceAddressSnapRange, TraceMemoryState> entry) {
@@ -324,6 +326,8 @@ public class DBTraceMemorySpace
 			@Override
 			protected Entry<TraceAddressSnapRange, TraceMemoryState> put(AddressRange range,
 					TraceMemoryState value) {
+				// This should not get called if the range is already the desired state
+				l.changed = true;
 				if (value != TraceMemoryState.UNKNOWN) {
 					stateMapSpace.put(new ImmutableTraceAddressSnapRange(range, snap), value);
 				}
@@ -331,8 +335,10 @@ public class DBTraceMemorySpace
 			}
 		}.set(start, end, state);
 
-		trace.setChanged(new TraceChangeRecord<>(TraceMemoryStateChangeType.CHANGED, this,
-			new ImmutableTraceAddressSnapRange(start, end, snap, snap), state));
+		if (l.changed) {
+			trace.setChanged(new TraceChangeRecord<>(TraceMemoryStateChangeType.CHANGED, this,
+				new ImmutableTraceAddressSnapRange(start, end, snap, snap), state));
+		}
 	}
 
 	protected void checkState(TraceMemoryState state) {