diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java
index 59e90d3a98..fcea0c38b4 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ConstantPropagationAnalyzer.java
@@ -435,6 +435,11 @@ public class ConstantPropagationAnalyzer extends AbstractAnalyzer {
 				// now get rid of all the instructions that were analyzed
 				todoSet.delete(resultSet);
 			}
+			
+			// make sure todoSet removes start address if no results
+			if (resultSet == null || resultSet.isEmpty()) {
+				todoSet.delete(start,start);
+			}
 		}
 	}