diff --git a/src/main/java/com/impactupgrade/nucleus/service/segment/HubSpotCrmService.java b/src/main/java/com/impactupgrade/nucleus/service/segment/HubSpotCrmService.java
index dd9a0b50d..fe2f61ae7 100644
--- a/src/main/java/com/impactupgrade/nucleus/service/segment/HubSpotCrmService.java
+++ b/src/main/java/com/impactupgrade/nucleus/service/segment/HubSpotCrmService.java
@@ -397,6 +397,12 @@ protected void setContactFields(ContactProperties contact, CrmContact crmContact
     }
     setProperty(env.getConfig().hubspot.fieldDefinitions.contactLanguage, crmContact.language, contact.getOtherProperties());
 
+    contact.setAddress(crmContact.mailingAddress.street);
+    contact.setCity(crmContact.mailingAddress.city);
+    contact.setState(crmContact.mailingAddress.state);
+    contact.setZip(crmContact.mailingAddress.postalCode);
+    contact.setCountry(crmContact.mailingAddress.country);
+
     // TODO: add/remove in default lists?
     if (crmContact.emailOptIn != null && crmContact.emailOptIn) {
       setProperty(env.getConfig().hubspot.fieldDefinitions.emailOptIn, true, contact.getOtherProperties());
diff --git a/src/main/java/com/impactupgrade/nucleus/service/segment/SfdcCrmService.java b/src/main/java/com/impactupgrade/nucleus/service/segment/SfdcCrmService.java
index eabd7fd93..dfb0101fc 100644
--- a/src/main/java/com/impactupgrade/nucleus/service/segment/SfdcCrmService.java
+++ b/src/main/java/com/impactupgrade/nucleus/service/segment/SfdcCrmService.java
@@ -430,6 +430,8 @@ protected void setContactFields(SObject contact, CrmContact crmContact) {
     if (crmContact.notes != null && crmContact.notes != "") {
       contact.setField("Description", crmContact.notes);
     }
+
+    // TODO: Avoiding setting the mailing address of a Contact, instead allowing the Account to handle it. But should we?
   }
 
   @Override