diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmit.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmit.java
index 3e546ea7df..12c9a24d67 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmit.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/app/plugin/processors/sleigh/PcodeEmit.java
@@ -664,6 +664,10 @@ public abstract class PcodeEmit {
 		AddressSpace spc = vn.getSpace().fixSpace(walker);
 		Address addr = spc.getTruncatedAddress(vn.getOffset().fix(walker), false);
 		// translate the address into the overlayspace if we have an overlayspace.
+		if (startAddress.getAddressSpace().isOverlaySpace()) {
+			OverlayAddressSpace overSpace = (OverlayAddressSpace) startAddress.getAddressSpace();
+			addr = overSpace.getOverlayAddress(addr);
+		}
 		ParserWalker oldwalker = walker;
 		long olduniqueoffset = uniqueoffset;
 		setUniqueOffset(addr);