Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r56ba1b163b0cbf6953638065b2108f745b17ec8f -rfe036771b201ca7320c90ea994ce218dd3196f3c
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 56ba1b163b0cbf6953638065b2108f745b17ec8f)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision fe036771b201ca7320c90ea994ce218dd3196f3c)
@@ -113,7 +113,7 @@
 #ifndef _RELEASE_
 #define NELSON_SUPPORT_TARGET_TEMP_C               6.0F                                                        // Nelson support heat disinfect target temperature in C.
 #define NELSON_SUPPORT_STOP_TEMP_C                 ( NELSON_SUPPORT_TARGET_TEMP_C - 5.0F )                     // Nelson support heat disinfect stop temperature in C.
-#define NELSON_SUPPORT_DISINFECT_TIME_MS           ( 2 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          // Nelson support heat disinfect time in milliseconds.
+#define NELSON_SUPPORT_DISINFECT_TIME_MS           ( 5 * SEC_PER_MIN * MS_PER_SECOND )   //( 2 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          // Nelson support heat disinfect time in milliseconds.
 #endif
 
 /// Cancellation paths
@@ -1049,6 +1049,8 @@
             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+            setValveState( VRD2, VALVE_STATE_OPEN );
             signalROPumpHardStop();
             // Set the drain pump to control mode
             setDrainPumpTargetOutletFlowLPM( HEAT_DISINFECT_TARGET_RO_FLOW_LPM );