Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r243440e3f50813aca213f8e167a833c03605d37e -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 243440e3f50813aca213f8e167a833c03605d37e)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * 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    SampleWater.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      02-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      01-Jun-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  19-Feb-2021
@@ -75,6 +75,7 @@
         cmdDGSampleWater( SAMPLE_WATER_CMD_FLUSH );
     }
     initSampleWater();
+    setCurrentSubState( (U32)SAMPLE_WATER_SETUP_STATE );
 }
 
 /*********************************************************************//**
@@ -117,6 +118,7 @@
 
     if ( priorSubState != currentSampleWaterState )
     {
+        setCurrentSubState( (U32)currentSampleWaterState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSampleWaterState );
     }
 }