Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -ra57994f752662abc0aaa8c2cf5c3af47ec2c5a20
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision a57994f752662abc0aaa8c2cf5c3af47ec2c5a20)
@@ -73,8 +73,12 @@
 *************************************************************************/
 void transitionToSampleWater( void )
 {
-    cmdDGSampleWater( SAMPLE_WATER_CMD_FLUSH );
-
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+    {
+        cmdDGSampleWater( SAMPLE_WATER_CMD_FLUSH );
+    }
     initSampleWater();
 }