diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/EmbeddedMediaAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/EmbeddedMediaAnalyzer.java
index 117e39f7ca..27c3157d1b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/EmbeddedMediaAnalyzer.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/EmbeddedMediaAnalyzer.java
@@ -57,10 +57,10 @@ public class EmbeddedMediaAnalyzer extends AbstractAnalyzer {
 
 		Memory memory = program.getMemory();
 		AddressSetView validMemorySet = memory.getLoadedAndInitializedAddressSet();
-		if (validMemorySet.isEmpty()) {
-			return false;  // valid addresses to search
-		}
 		AddressSetView searchSet = set.intersect(validMemorySet);
+		if (searchSet.isEmpty()) {
+			return false;  // no valid addresses to search
+		}
 
 		MemoryBytePatternSearcher searcher = new MemoryBytePatternSearcher("Embedded Media");