Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf1cb4be5fb8201cec188589e683c8bf20d895ec0 -rbdbc27dc5dc85c84f71ea1bbb4e465317a6d11de
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision bdbc27dc5dc85c84f71ea1bbb4e465317a6d11de)
@@ -646,8 +646,8 @@
  *************************************************************************/
 static void calcMeasuredPumpsSpeed( CONCENTRATE_PUMPS_T pumpId, U16 pulseWidthCount )
 {
-    F32 pulseWidthInMicroSeconds            = (F32)pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION;
-    BOOL isPulseWidthOut                    = ( pulseWidthInMicroSeconds <= (F32)CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE );
+    F32 pulseWidthInMicroSeconds = (F32)pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION;
+    BOOL isPulseWidthOut         = ( pulseWidthInMicroSeconds <= (F32)CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE );
 
     concentratePumps[ pumpId ].pulseWidthUS = pulseWidthInMicroSeconds;
 
@@ -658,8 +658,7 @@
     {
         concentratePumps[ pumpId ].measuredPumpSpeed.data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
     }
-
-    if ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount )
+    else if ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount )
     {
         concentratePumps[ pumpId ].measuredPumpSpeed.data = 0.0;
     }