Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r5e01e06bf4c6b05665ef096ea873d09b7bc904d3
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 5e01e06bf4c6b05665ef096ea873d09b7bc904d3)
@@ -344,12 +344,8 @@
 {
     F32 artPres = getLongFilteredArterialPressure();
     F32 rotSpd  = filteredBloodPumpSpeed / BP_GEAR_RATIO;
-#ifndef WORN_OUT_CARTRIDGE
     U32 r       = getBloodPumpRotorCount();
     U32 rotCnt  = CAP( r, BP_MAX_ROTOR_COUNT_FOR_WEAR );
-#else
-    U32 rotCnt = BP_MAX_ROTOR_COUNT_FOR_WEAR;
-#endif
     F32 wear    = BP_FLOW_WEAR_A_TERM * (F32)rotCnt + BP_FLOW_WEAR_B_TERM;
     F32 alpha   = wear * artPres + BP_FLOW_ALPHA_Y_INTERCEPT;
     F32 flow    = alpha * BP_ML_PER_ROTOR_REV * rotSpd;
@@ -481,7 +477,11 @@
  *************************************************************************/
 void resetBloodPumpRotorCount( void )
 {
+#ifndef WORN_OUT_CARTRIDGE
     bloodPumpRotorCounter.data = 0;
+#else
+    bloodPumpRotorCounter.data = BP_MAX_ROTOR_COUNT_FOR_WEAR;
+#endif
 }
 
 /*********************************************************************//**