diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeChunker.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeChunker.java
index adee495add..a474c8724b 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeChunker.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/AddressRangeChunker.java
@@ -81,7 +81,11 @@ public class AddressRangeChunker implements Iterable<AddressRange> {
 				}
 
 				long available = end.subtract(nextStartAddress) + 1; // +1 to be inclusive
-				int size = Math.min(chunkSize, (int) available);
+
+				int size = chunkSize;
+				if (available >= 0 && available < chunkSize) {
+					size = (int) available;
+				}
 
 				Address currentStart = nextStartAddress;
 				Address currentEnd = nextStartAddress.add(size - 1); // -1 since inclusive