Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -rf502a589b7a6c39c6fd57ceee778f5c94481af14
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision f502a589b7a6c39c6fd57ceee778f5c94481af14)
@@ -66,6 +66,9 @@
 #define FLUSH_CIRCULATION_CONC_PUMPS_WAIT_TIME_MS  ( 3 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Flush circulation concentrate pumps on time in milliseconds.
 #define MAX_FLUSH_CIRC_TEMP_SENSOR_DIFF_C          3.0F                                                        ///< Maximum flush circulation temperature difference tolerance in C.
 #define NUM_OF_TEMP_SENSORS_TO_AVG                 3.0F                                                        ///< Number of temperature sensors to average to check the difference.
+#define ACID_PUMP_FLUSH_RECIRCULATE_SPEED_MLPM     -30.0F                                                      ///< Acid pump in flush recirculate speed in mL/min.
+#define BICARB_PUMP_FLUSH_RECIRCULATE_SPEED_MLPM   30.6F                                                       ///< Bicarb pump in flush recirculate speed in mL/min.
+
 #define ACID_PUMP_SPEED_ML_PER_MIN                 30.6F                                                       ///< Acid concentrate pump speed in mL/min.
 // The acid pump is 2% faster than the bicarb pump to create a flow from acid to bicarb line during heat disinfect
 #define BICARB_PUMP_SPEED_ML_PER_MIN               -30.0F                                                      ///< Bicarb concentrate pump speed in mL/min.
@@ -318,7 +321,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectMode();
-    setCurrentSubState( heatDisinfectState );
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectState;
@@ -694,8 +697,8 @@
         {
             areTempSensorsInRange = TRUE;
             // Turn the pumps on in reverse
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   ACID_PUMP_SPEED_ML_PER_MIN );
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );
+            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_FLUSH_RECIRCULATE_SPEED_MLPM );
+            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_FLUSH_RECIRCULATE_SPEED_MLPM );
 
             // Turn on the concentrate pumps
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
@@ -1329,6 +1332,8 @@
         }
         else
         {
+            setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
+            setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
             stateTimer   = getMSTimerCount();
             state        = DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1;
@@ -1363,7 +1368,7 @@
         setValveState( VPI, VALVE_STATE_OPEN );
         setValveState( VRD1, VALVE_STATE_OPEN );
         setValveState( VBF, VALVE_STATE_CLOSED );
-        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
@@ -1600,14 +1605,16 @@
  *************************************************************************/
 static void failHeatDisinfect( void )
 {
+    // If a fault alarm is active go to mode fault otherwise for cleaning mode alarms, transition to standby
+    DG_OP_MODE_T nextOpMode = ( FALSE == isDGFaultAlarmActive() ? DG_MODE_STAN : DG_MODE_FAUL );
+
     // In the cleaning modes the alarms are triggered but the mode is not transitioned to fault automatically
     // so transition to fault mode is done here
     if ( alarmDetectedPendingTrigger != ALARM_ID_NO_ALARM )
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevHeatDisinfectState )
     }
-
-    requestNewOperationMode( DG_MODE_STAN );
+    requestNewOperationMode( nextOpMode );
 }
 
 /*********************************************************************//**