Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r6a4bdeb4743eab20c2eaf7bcc08738d24c830001 -r98d81183a0783497cf5717ef34aa5e862136a790
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 6a4bdeb4743eab20c2eaf7bcc08738d24c830001)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 98d81183a0783497cf5717ef34aa5e862136a790)
@@ -522,7 +522,6 @@
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VRD1, VALVE_STATE_OPEN );
             setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
-            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
             // Assume reservoir 1 is full and drain it
@@ -1121,6 +1120,7 @@
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_CLOSED );
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
             turnOffUVReactor( INLET_UV_REACTOR );
             turnOffUVReactor( OUTLET_UV_REACTOR );
             signalROPumpHardStop();