Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r9ac050d6099effbdd62070173d14dd5e225d5310 -ra2ea8edd918761b403cbe2c00e1bfe2fc69be5ea
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 9ac050d6099effbdd62070173d14dd5e225d5310)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision a2ea8edd918761b403cbe2c00e1bfe2fc69be5ea)
@@ -266,6 +266,7 @@
     //Monitor Pump Park status
     monitorPumpParkStatus();
 
+    //TODO: Uncomment once done.
     // Temporarily disable concentrate pump speed mismatch alarms
     // monitorPumpSpeed( D11_PUMP, ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR );
     // monitorPumpSpeed( D10_PUMP, ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR );
@@ -851,6 +852,8 @@
     concentratePumps[ pumpId ].currentPumpSpeed             = 0.0F;   // set target rate to zero
     pumpTargetSpeed[ pumpId ].data                          = 0.0F;
     pumpTargetRevCnt[ pumpId ].data                         = 0;
+    measuredPumpSpeed[ pumpId ].data                         = 0.0F;
+    concentratePumps[ pumpId ].pulseWidthUS                  = 0.0F;
     isDosingCompleted [ pumpId ]                            = TRUE;
 
     // Disable the motor when stopping, to take next revolution count
@@ -1116,16 +1119,26 @@
 
         pulseWidthInMicroSeconds                = pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION;
         concentratePumps[ pumpId ].pulseWidthUS = pulseWidthInMicroSeconds;
-        isPumpPulseWidthOut                     = ( pulseWidthInMicroSeconds <= (F32)CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE );
+        isPumpPulseWidthOut                     = FALSE;
 
         // Determine measured speed for the pump
-        if ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount )
+        if ( ( concentratePumps[ pumpId ].currentPumpSpeed <= NEARLY_ZERO ) ||
+             ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount ) )
         {
             measuredPumpSpeed[ pumpId ].data = 0.0F;
         }
-        else if ( FALSE == isPumpPulseWidthOut )
+        else
         {
-            measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER * SEC_PER_MIN;
+            isPumpPulseWidthOut = ( pulseWidthInMicroSeconds <= (F32)CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE );
+
+            if ( FALSE == isPumpPulseWidthOut )
+            {
+                measuredPumpSpeed[ pumpId ].data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE_DIENER * SEC_PER_MIN;
+            }
+            else
+            {
+                measuredPumpSpeed[ pumpId ].data = 0.0F;
+            }
         }
 
         // If pulse width is out of range capture pump out of range, pumpId and pulse width