Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rf4f7e0ee3baef51d91de64d44a0a00ff967f56c0 -r0f3bef57ed414c9d274acc7ec64a327f96683c29
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision f4f7e0ee3baef51d91de64d44a0a00ff967f56c0)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0f3bef57ed414c9d274acc7ec64a327f96683c29)
@@ -1063,20 +1063,21 @@
  * @details Inputs: none
  * @details Outputs: none
  * @param mtr_rpm, RPM of the motor.
- *        gear_ratio, Gear ratio of motor vs motor
+ * @param gear_ratio, Gear ratio of motor vs motor
  * @return Persistent error test time in (ms)
  *************************************************************************/
 U32 getPumpRotorErrorPersistTime( F32 mtr_rpm, F32 gear_ratio )
 {
     U32 err_persist_time = HEX_32_BIT_FULL_SCALE;  // 49 days
+    U32 temporaryPersistentTimeout = 10 * MS_PER_SECOND;
 
     if ( mtr_rpm > 0 )
     {
         /// Calculate persist time for rotor speed error condition.
         err_persist_time = ( ( DIP_ROTOR_ERROR_PERSIST_ROTATION_MIN / ( mtr_rpm / gear_ratio / SEC_PER_MIN ) ) * MS_PER_SECOND );
     }
 
-   return err_persist_time;
+   return err_persist_time + temporaryPersistentTimeout;
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rb14be675984dc3ee4d2afdb031c62eb8f1d5f0c2 -r0f3bef57ed414c9d274acc7ec64a327f96683c29
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision b14be675984dc3ee4d2afdb031c62eb8f1d5f0c2)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 0f3bef57ed414c9d274acc7ec64a327f96683c29)
@@ -1127,10 +1127,7 @@
         // Check measured rotor speed vs. measured motor speed while controlling to target
         if ( ( deltaRotorSpeed > DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM ) && ( measMotorSpeedDeltaPct > DOP_MAX_MOTOR_SPEED_VS_TRGT_DIFF_PCT ) )
         {
-            U32 temporaryPersistentTimeout = ( getPumpRotorErrorPersistTime( measMotorSpeed, DOP_GEAR_RATIO ) / TASK_PRIORITY_INTERVAL ) +
-                                             ( ( 10 * MS_PER_SECOND ) / TASK_PRIORITY_INTERVAL );
-
-            if ( ++errorDialOutRotorSpeedPersistTimerCtr >= temporaryPersistentTimeout )
+            if ( ++errorDialOutRotorSpeedPersistTimerCtr >= ( getPumpRotorErrorPersistTime( measMotorSpeed, DOP_GEAR_RATIO ) / TASK_PRIORITY_INTERVAL ) )
             {
 #ifndef _RELEASE_
                 if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_SPEED_CHECKS ) != SW_CONFIG_ENABLE_VALUE )