diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java b/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
index a091bb3d66..b6536cd3f5 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/program/model/listing/CodeUnitFormat.java
@@ -802,7 +802,7 @@ public class CodeUnitFormat {
 		long originalValue = (addr.isStackAddress() &&
 			originalScalar.bitLength() == addr.getAddressSpace().getSize())
 					? originalScalar.getSignedValue()
-					: originalScalar.getValue();
+					: originalScalar.getUnsignedValue();
 		long addrOffset;
 		if (addr instanceof SegmentedAddress) {
 			addrOffset = ((SegmentedAddress) addr).getSegmentOffset();