Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r41885eaa6f8d4b38f57448bc6f6639867e8a8d24 -rdfa14665d19fa4df4166412becdf01cbcd157c96
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 41885eaa6f8d4b38f57448bc6f6639867e8a8d24)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision dfa14665d19fa4df4166412becdf01cbcd157c96)
@@ -5,13 +5,13 @@
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file ModePreTreat.c
+* @file    ModePreTreat.c
 *
-* @author (last) Sean Nash
-* @date (last) 06-Oct-2020
+* @author  (last)      Quang Nguyen
+* @date    (last)      24-Aug-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -388,6 +388,10 @@
         case ALARM_ACTION_END_TREATMENT:
             if ( HD_PRE_TREATMENT_PRIME_STATE > currentPreTreatmentState )
             {
+                if ( HD_PRE_TREATMENT_WATER_SAMPLE_STATE == currentPreTreatmentState )
+                {
+                    cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+                }
                 requestNewOperationMode( MODE_STAN );
             }
             else
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r41885eaa6f8d4b38f57448bc6f6639867e8a8d24 -rdfa14665d19fa4df4166412becdf01cbcd157c96
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 41885eaa6f8d4b38f57448bc6f6639867e8a8d24)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision dfa14665d19fa4df4166412becdf01cbcd157c96)
@@ -5,13 +5,13 @@
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file TreatmentEnd.c
+* @file    TreatmentEnd.c
 *
-* @author (last) Sean Nash
-* @date (last) 04-Feb-2021
+* @author  (last)      Sean Nash
+* @date    (last)      19-Aug-2021
 *
-* @author (original) Sean
-* @date (original) 04-Feb-2021
+* @author  (original)  Sean Nash
+* @date    (original)  05-Feb-2021
 *
 ***************************************************************************/