Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rc3ad9ff5401aed42da66a2f47c7d02332f9fd1b5 -r0b800d3abb747d0f1f3dc8f67777efb9631c18e0
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision c3ad9ff5401aed42da66a2f47c7d02332f9fd1b5)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0b800d3abb747d0f1f3dc8f67777efb9631c18e0)
@@ -410,11 +410,14 @@
  *************************************************************************/
 void signalBloodPumpHardStop( void )
 {
-    targetBloodFlowRate = 0;
-    stopBloodPump();
-    bloodPumpState = BLOOD_PUMP_OFF_STATE;
+    bloodPumpControlMode = PUMP_CONTROL_MODE_OPEN_LOOP;
+    bloodPumpDirection = MOTOR_DIR_FORWARD;
     bloodPumpPWMDutyCyclePct = BP_PWM_ZERO_OFFSET;
+    bloodPumpState = BLOOD_PUMP_OFF_STATE;
     bpControlTimerCounter = 0;
+    targetBloodFlowRate = 0;
+    resetBloodPumpRPMMovingAverage();
+    stopBloodPump();
     resetPIController( PI_CONTROLLER_ID_BLOOD_FLOW, MIN_BLOOD_PUMP_PWM_DUTY_CYCLE );
 }