diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java
index a54ddf2b05..c0e65045d9 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractBaseDBTraceDefinedUnitsView.java
@@ -376,8 +376,11 @@ public abstract class AbstractBaseDBTraceDefinedUnitsView<T extends AbstractDBTr
 		if (extending == null) {
 			toScan = span;
 		}
+		else if (span.lmax() <= extending.getEndSnap()) {
+			// we're shrinking or staying the same, so not possible to collide with others
+			return span;
+		}
 		else {
-			assert span.lmax() > extending.getEndSnap();
 			toScan = span.withMin(extending.getEndSnap() + 1);
 		}
 		T truncateBy =