Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r125a27d5a3a116e7b7473ff180daf247270d8e57 -rb8d74fc5b07d0e62d841b4c5a786b2be4e593c63
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 125a27d5a3a116e7b7473ff180daf247270d8e57)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision b8d74fc5b07d0e62d841b4c5a786b2be4e593c63)
@@ -117,6 +117,7 @@
 void initPreTreatmentMode( void )
 {
     currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
+    currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_START_STATE;
     setUFVolStatus = FALSE;
     patientConnectionConfirm = FALSE;
     fillReservoirOneStartRequested = FALSE;
@@ -496,6 +497,8 @@
     if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() )
 #endif
     {
+        cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+
         if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() )
         {
             if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )