Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r20c90ee790deb7a38da44f948fef5b34d541d930 -r65586d515b6824115a90d81595915be02213f679
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 20c90ee790deb7a38da44f948fef5b34d541d930)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 65586d515b6824115a90d81595915be02213f679)
@@ -482,26 +482,46 @@
  * @details Outputs: currentStandbyState
  * @return TRUE if signal accepted, FALSE if not
  *************************************************************************/
-BOOL signalInitiateStandbyDisinfectSubmode( void )
+BOOL signalInitiateStandbyDisinfectSubmode( U32 cmd )
 {
     BOOL result                            = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
 
-    if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
+    if ( cmd == 0 )
     {
-        if ( TRUE == isDGCommunicating() )
+        // Cancel Disinfect command
+        if ( STANDBY_WAIT_FOR_DISINFECT_STATE == currentStandbyState )
         {
-            currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+            currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             result              = TRUE;
             rejReason           = REQUEST_REJECT_REASON_NONE;
         }
         else
         {
-            rejReason = REQUEST_REJECT_REASON_DG_COMM_LOST;
+            result              = FALSE;
+            rejReason           = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
         }
     }
+    else
+    {
+        // Initiate Disinfect command
+        if ( ( MODE_STAN == getCurrentOperationMode() ) && ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) )
+        {
+            if ( TRUE == isDGCommunicating() )
+            {
+                currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
+                result              = TRUE;
+                rejReason           = REQUEST_REJECT_REASON_NONE;
+            }
+            else
+            {
+                result              = FALSE;
+                rejReason           = REQUEST_REJECT_REASON_DG_COMM_LOST;
+            }
+        }
+    }
 
-    sendDisinfectConfirmResponse( result, rejReason );
+    handleSetHDStandbyDisinfectSubmodeResponse( result, rejReason );
 
     return result;
 }
Index: firmware/App/Modes/ModeStandby.h
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r65586d515b6824115a90d81595915be02213f679
--- firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModeStandby.h	(.../ModeStandby.h)	(revision 65586d515b6824115a90d81595915be02213f679)
@@ -55,7 +55,7 @@
 
 BOOL signalUserInitiateChemicalDisinfectMode( void );
 
-BOOL signalInitiateStandbyDisinfectSubmode( void );
+BOOL signalInitiateStandbyDisinfectSubmode( U32 cmd );
 
 BOOL testSetStandbyModePublishIntervalOverride( U32 ms );
 BOOL testResetStandbyModePublishIntervalOverride( void );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8b73263b38f449dacc0795c67a7cf6240cb79026 -r65586d515b6824115a90d81595915be02213f679
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8b73263b38f449dacc0795c67a7cf6240cb79026)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 65586d515b6824115a90d81595915be02213f679)
@@ -888,24 +888,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 );
+    }
 }
 
 /*********************************************************************//**