Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r88e9ed0f8ed4fa0ee3424a1e241787aab8e60683 -rf9a866abfc44db38c01cb795fea894cce1042eec
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 88e9ed0f8ed4fa0ee3424a1e241787aab8e60683)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f9a866abfc44db38c01cb795fea894cce1042eec)
@@ -3206,26 +3206,28 @@
     MESSAGE_T msg;
     HD_SERVICE_RECORD_T service;
     DG_SERVICE_AND_USAGE_DATA_T dgData;
+    U08 *payloadPtr = msg.payload;
 
     getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
     getHDVersionDGServiceAndUsageData( &dgData );
 
-    U08 *payloadPtr = msg.payload;
+    if ( 0 == message->hdr.payloadLen )
+    {
+        // Create a message record
+        blankMessage( &msg );
+        msg.hdr.msgID      = MSG_ID_HD_SERVICE_SCHEDULE_DATA;
+        msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
-    // Create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID      = MSG_ID_HD_SERVICE_SCHEDULE_DATA;
-    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+        // Fill message payload
+        memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
+        payloadPtr += sizeof( U32 );
+        memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
+        payloadPtr += sizeof( U32 );
+        memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceDateEpoch, sizeof( U32 ) );
+        payloadPtr += sizeof( U32 );
+        memcpy( payloadPtr, &dgData.dgServiceRecord.serviceIntervalSeconds, sizeof( U32 ) );
+    }
 
-    // Fill message payload
-    memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceDateEpoch, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &dgData.dgServiceRecord.serviceIntervalSeconds, sizeof( U32 ) );
-
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
 }