Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r80a6638b362f5f613c0665200023d181f614d1bc -r85c052e0c8340e4a26a072e8aba70c2e17ce00e2
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 80a6638b362f5f613c0665200023d181f614d1bc)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 85c052e0c8340e4a26a072e8aba70c2e17ce00e2)
@@ -892,24 +892,26 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetHDStandbyDisinfectSubmode function handles setting the
+ * The handleSetHDStandbyDisinfectSubmodeRequest function handles setting the
  * standby submode to wait for disisnfect state.
- * @details Inputs: none
+ * @details Inputs: 1=initiate, 0=cancel
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleSetHDStandbyDisinfectSubmodeRequest( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    U32 cmd;
 
-    // The payload should be 0 in this case because there is mode in this command
-    if ( 0 == message->hdr.payloadLen )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
-        signalInitiateStandbyDisinfectSubmode();
+        memcpy( &cmd, &message->payload[0], sizeof( U32 ) );
+        signalInitiateStandbyDisinfectSubmode( cmd );
     }
-
-    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+    else
+    {
+        handleSetHDStandbyDisinfectSubmodeResponse( FALSE, REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT );
+    }
 }
 
 /*********************************************************************//**