Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
@@ -129,10 +129,12 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
 
+#ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
     {
         sampleWaterResult = TRUE;
     }
+#endif
 
     if ( TRUE == sampleWaterResult )
     {