Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -r669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 669f36cf32c3b500aa2fd5b08c58ee5e6b2e7f08)
@@ -81,7 +81,7 @@
  *************************************************************************/
 void initStandbyMode( void )
 {
-    standbyState                           = DG_STANDBY_MODE_STATE_START;
+    standbyState                           = DG_STANDBY_MODE_STATE_IDLE;
     stopSampleWaterRequest                 = FALSE;
     startSampleWaterRequest                = FALSE;
     flushFilterRequest                     = FALSE;
@@ -131,10 +131,6 @@
     // execute current Standby state
     switch ( standbyState )
     {
-        case DG_STANDBY_MODE_STATE_START:
-            standbyState = DG_STANDBY_MODE_STATE_IDLE;
-            break;
-
         case DG_STANDBY_MODE_STATE_IDLE:
             standbyState = handleStandbyIdleState();
             break;
@@ -224,7 +220,7 @@
 static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterState( void )
 {
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
-    U32 const filterFlushTimePeriod_ms = getU32OverrideValue( &filterFlushTimePeriod );
+    U32 filterFlushTimePeriod_ms  = getU32OverrideValue( &filterFlushTimePeriod );
 
     checkInletWaterPressure();