diff --git a/lib/common/ipc.c b/lib/common/ipc.c
index 536e75a..e57b580 100644
--- a/lib/common/ipc.c
+++ b/lib/common/ipc.c
@@ -119,6 +119,9 @@ create_request_adv(const char *task, xmlNode * msg_data,
 
     /* HOSTTO will be ignored if it is to the DC anyway. */
     if (host_to != NULL && strlen(host_to) > 0) {
+#if SUPPORT_HEARTBEAT
+        crm_xml_add(request, F_CRM_HOST_TO, g_strdown(host_to));
+#endif
         crm_xml_add(request, F_CRM_HOST_TO, host_to);
     }
 
diff --git a/lib/common/utils.c b/lib/common/utils.c
index 6147f35..64673d2 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -1855,6 +1855,11 @@ attrd_update_delegate(crm_ipc_t * ipc, char command, const char *host, const cha
     crm_xml_add(update, F_ATTRD_VALUE, value);
     crm_xml_add(update, F_ATTRD_DAMPEN, dampen);
     crm_xml_add(update, F_ATTRD_SECTION, section);
+#if SUPPORT_HEARTBEAT
+    if(host != NULL && strlen(host) > 0) {
+        crm_xml_add(update, F_ATTRD_HOST, host);
+    }
+#endif
     crm_xml_add(update, F_ATTRD_HOST, host);
     crm_xml_add(update, F_ATTRD_SET, set);
 #if ENABLE_ACL