diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java
index 7b19be826e5..675dc6c4cff 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/util/PersonHelper.java
@@ -268,7 +268,7 @@ public class PersonHelper {
 				if (theAllowOverwriting || person.getName().isEmpty()) {
 					person.setName(patient.getName());
 				}
-				if (theAllowOverwriting || person.getName().isEmpty()) {
+				if (theAllowOverwriting || person.getAddress().isEmpty()) {
 					person.setAddress(patient.getAddress());
 				}
 				if (theAllowOverwriting || person.getTelecom().isEmpty()) {