Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rb30c057e2f4371a0ef49248303b85f321adf7a23 -r27556b6433949f1d69c0ad954c7019af68bf5b29
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision b30c057e2f4371a0ef49248303b85f321adf7a23)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 27556b6433949f1d69c0ad954c7019af68bf5b29)
@@ -70,6 +70,7 @@
 static BOOL treatStartReqReceived;                                                             ///< Flag indicates user has requested initiation of a treatment.
 static GENERIC_CONFIRM_ID_T disinfectCancelReqID;                                              ///< ID of requested cancel disinfect mode.
 static BOOL homingInitiated;                                                                   ///< Boolean flag to indicate homing is initiated.
+static BOOL flagNoDisinfectRequired = FALSE;                                                   ///< Flag indicates disinfect not required on next mode entry.
 static DG_CLEANING_MODE_STATUS_T currentDGCleaningMode;                                        ///< Current DG cleaning mode status.
 
 /// Interval (in task intervals) at which to publish standby mode data to CAN bus.
@@ -152,13 +153,14 @@
     setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
 
     // If we just exited Post Treatment Mode, goto disinfect sub state.
-    if ( MODE_POST == previousOpMode )
+    if ( ( MODE_POST == previousOpMode ) && ( flagNoDisinfectRequired != TRUE ) )
     {
         doorClosedRequired( FALSE, FALSE );             // door no longer required to be closed in standby mode
         currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
     }
     else
     {
+        flagNoDisinfectRequired = FALSE;
         doorClosedRequired( TRUE, FALSE );
     }
     syringeDetectionRequired( FALSE );
@@ -307,6 +309,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The signalNoDisinfectRequired function signals the standby mode module
+ * that a disinfection will not be required on next entry to standby mode.
+ * @details Inputs: none
+ * @details Outputs: flagNoDisinfectRequired
+ * @return none
+ *************************************************************************/
+void signalNoDisinfectRequired( void )
+{
+    flagNoDisinfectRequired = TRUE;
+}
+
+/*********************************************************************//**
+ * @brief
  * The signalAlarmActionToStandbyMode function executes the given alarm action
  * as appropriate while in Standby Mode.
  * @details Inputs: none