diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java
index 0c611eac28..47d44072c2 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/references/ReferenceDBManager.java
@@ -518,8 +518,8 @@ public class ReferenceDBManager implements ReferenceManager, ManagerDB, ErrorHan
 			}
 		}
 		else if (toAddrIsBase) {
-			Address addr = toAddr.addWrap(offset);
-			if (isExternalBlockAddress(addr)) {
+			toAddr = toAddr.addWrap(offset);
+			if (isExternalBlockAddress(toAddr)) {
 				badOffsetReference = true;
 			}
 		}