Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3 -r6b13bb16465fb2eee853288fe0d109223d978cdd
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 6b13bb16465fb2eee853288fe0d109223d978cdd)
@@ -462,6 +462,7 @@
 
         // Close VPi to prevent wasting water
         setValveState( VPI, VALVE_STATE_CLOSED );
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
 
         // Set the actuators to drain R1
         setValveState( VRD1, VALVE_STATE_OPEN );
@@ -505,7 +506,6 @@
             setValveState( VPI, VALVE_STATE_OPEN );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setValveState( VRD1, VALVE_STATE_CLOSED );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
 
@@ -534,6 +534,8 @@
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R2;
         }
 
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
+
         // Start the timer
         stateTimer = getMSTimerCount();
     }
@@ -588,6 +590,7 @@
             stateTimer = getMSTimerCount();
             state = DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN;
         }
+        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
@@ -1581,7 +1584,7 @@
             // De-energize all the valves and set the VDr to drain R2
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+            setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_OPEN );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );