Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -ra4e044315bbfaaeff11cb9391485897458a48a5f -re2ca8378636da437905103e59033cf036b5304a9
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision a4e044315bbfaaeff11cb9391485897458a48a5f)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision e2ca8378636da437905103e59033cf036b5304a9)
@@ -82,8 +82,6 @@
 static const U32 DOP_OFF_ERROR_PERSIST          = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 /// Persist time (task intervals) motor speed error condition.
 static const U32 DOP_MOTOR_SPEED_ERROR_PERSIST  = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
-/// Persist time (task intervals) rotor speed error condition.
-static const U32 DOP_ROTOR_SPEED_ERROR_PERSIST  = ((12 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 /// Persist time (task intervals) pump direction error condition.
 static const U32 DOP_DIRECTION_ERROR_PERSIST    = (250 / TASK_PRIORITY_INTERVAL);
 
@@ -1047,7 +1045,7 @@
         F32 cmdMotorSpeed = DOP_PWM_TO_MOTOR_SPEED_RPM( dialOutPumpPWMDutyCyclePctSet );
         F32 deltaMotorSpeed = fabs( measMotorSpeed - cmdMotorSpeed );
         F32 deltaMCMotorSpeed = fabs( measMCMotorSpeed - cmdMotorSpeed );
-        F32 measRotorSpeed = getMeasuredDialOutPumpRotorSpeed();
+        F32 measRotorSpeed = fabs( getMeasuredDialOutPumpRotorSpeed() );
         F32 measMotorSpeedInRotorRPM = measMotorSpeed / DOP_GEAR_RATIO;
         F32 deltaRotorSpeed = fabs( measRotorSpeed - measMotorSpeedInRotorRPM );
 
@@ -1072,7 +1070,7 @@
         // Check measured rotor speed vs. measured motor speed while controlling to target
         if ( deltaRotorSpeed > DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM )
         {
-            if ( ++errorDialOutRotorSpeedPersistTimerCtr >= DOP_ROTOR_SPEED_ERROR_PERSIST )
+            if ( ++errorDialOutRotorSpeedPersistTimerCtr >= ( getPumpRotorErrorPersistTime( measMotorSpeed, DOP_GEAR_RATIO ) / TASK_PRIORITY_INTERVAL )  )
             {
 #ifndef _RELEASE_
                 if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE )