Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc3043e70dbb4f955d76510073f739d53d61707fe -re7bac6755146ac8f05b3a6de5d6014cab95f3fd8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c3043e70dbb4f955d76510073f739d53d61707fe)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e7bac6755146ac8f05b3a6de5d6014cab95f3fd8)
@@ -3606,25 +3606,28 @@
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
 
-    U32 accept = 1;
-    U32 reson  = 0;
-    HD_INSTITUTIONAL_RECORD_T hdInstitutionalRecord;
+    if ( 0 == message->hdr.payloadLen )
+    {
+        U32 accept = 1;
+        U32 reson  = 0;
+        HD_INSTITUTIONAL_RECORD_T hdInstitutionalRecord;
 
-    getNVRecord2Driver( GET_INSTITUTIONAL_RECORD, (U08*)&hdInstitutionalRecord, sizeof( HD_INSTITUTIONAL_RECORD_T ),  0, ALARM_ID_NO_ALARM );
+        getNVRecord2Driver( GET_INSTITUTIONAL_RECORD, (U08*)&hdInstitutionalRecord, sizeof( HD_INSTITUTIONAL_RECORD_T ),  0, ALARM_ID_NO_ALARM );
 
-    // Create a message record
-    blankMessage( &msg );
-    msg.hdr.msgID      = MSG_ID_HD_INSTITUTIONAL_RECORD_RESPONSE;
-    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( HD_INSTITUTIONAL_RECORD_T ) - sizeof( U32 ) - sizeof( U16 );
+        // Create a message record
+        blankMessage( &msg );
+        msg.hdr.msgID      = MSG_ID_HD_INSTITUTIONAL_RECORD_RESPONSE;
+        msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( HD_INSTITUTIONAL_RECORD_T ) - sizeof( U32 ) - sizeof( U16 );
 
-    memcpy( payloadPtr, &accept, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &reson, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &hdInstitutionalRecord, sizeof( HD_INSTITUTIONAL_RECORD_T ) - sizeof( U32 ) - sizeof( U16 ) );
+        memcpy( payloadPtr, &accept, sizeof( U32 ) );
+        payloadPtr += sizeof( U32 );
+        memcpy( payloadPtr, &reson, sizeof( U32 ) );
+        payloadPtr += sizeof( U32 );
+        memcpy( payloadPtr, &hdInstitutionalRecord, sizeof( HD_INSTITUTIONAL_RECORD_T ) - sizeof( U32 ) - sizeof( U16 ) );
 
-    // 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_NOT_REQUIRED );
+        // 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_NOT_REQUIRED );
+    }
 }