Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r7debf90c11b15542bec9dd9e3e570bb802e84f47 -rd26566bb6c761238ae6526ce2284ab689f6abf4d
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 7debf90c11b15542bec9dd9e3e570bb802e84f47)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d26566bb6c761238ae6526ce2284ab689f6abf4d)
@@ -200,18 +200,14 @@
         checkInletWaterTemperature();
         checkInletWaterPressure();
 
-        // Check if any of the alarms are active
-        if ( ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )    ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )   ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )    ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )     ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ) ) ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE ) )          ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )       ||
-             ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
-        {
-            status = TRUE;
-        }
+        status |= isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE );
+        status |= isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE );
+        status |= isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE );
+        status |= isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE );
+        status |= isAlarmActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE );
+        status |= isAlarmActive( ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE );
+        status |= isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE );
+        status |= isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE );
     }
 
     return status;
@@ -335,7 +331,7 @@
 {
     DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
 
-    if ( TRUE == startSampleWaterRequest )
+    if ( ( TRUE == startSampleWaterRequest ) && ( FALSE == areInletWaterConditionsAlarmsActive() ) )
     {
         startSampleWaterRequest = FALSE;
         waterSampleStartTime = getMSTimerCount();