Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -r3970ba21aa2500f662620ef3d4b3e1e7a48fc47a
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 3970ba21aa2500f662620ef3d4b3e1e7a48fc47a)
@@ -75,6 +75,7 @@
         cmdDGSampleWater( SAMPLE_WATER_CMD_FLUSH );
     }
     initSampleWater();
+    setCurrentSubState( (U32)SAMPLE_WATER_SETUP_STATE );
 }
 
 /*********************************************************************//**