Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rf5d8da2ffed2cb22132c791039ba8a1221e31223 -r59325358b032b544b34d4f20029cf1c7ffeca8c7
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision f5d8da2ffed2cb22132c791039ba8a1221e31223)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 59325358b032b544b34d4f20029cf1c7ffeca8c7)
@@ -1442,21 +1442,12 @@
     if ( TRUE == setActuatorsPriorToTransition )
     {
         signalROPumpHardStop();
-
-        if ( TRUE == isDrainPumpOn() )
-        {
-            // Stop the drain pump and the RO pump to exit the closed loop
-            signalDrainPumpHardStop();
-            setValveState( VRD1, VALVE_STATE_CLOSED );
-        }
-        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;
-        }
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        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;
     }
 
     return state;