Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -rb410b42053aab8a94bdd948f857096d2e362cc45 -rcb488a422b4f69a6044d78be09141231bcb9e523
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision b410b42053aab8a94bdd948f857096d2e362cc45)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision cb488a422b4f69a6044d78be09141231bcb9e523)
@@ -1378,13 +1378,14 @@
 
             rsrvrsStatus.rsrvr[ switchRsrvrID ].rStatus = DG_RESERVOIR_ABOVE_TARGET;
             state                                       = DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_STATE;
-            setHeatDisinfectActiveCoolActuators( state );
         }
         else if ( DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R2_STATE == state )
         {
             state = DG_HEAT_DISINFECT_ACTIVE_COOL_STATE_COMPLETE;
         }
 
+        // Set the actuators state after setting the next state
+        setHeatDisinfectActiveCoolActuators( state );
         stateStartTimeMS = getMSTimerCount();
     }