Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r25ede6f944eb53b68c8073404663c99d3ce158b0 -rce64b7e15824641a6a6465c28eec5d8ec593f110
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 25ede6f944eb53b68c8073404663c99d3ce158b0)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
@@ -117,6 +117,7 @@
 
     if ( priorSubState != currentSampleWaterState )
     {
+        setCurrentSubState( (U32)currentSampleWaterState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSampleWaterState );
     }
 }