Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r9353792f6dbd624a1d55cf1e87fa848e8fbaea71 -r0b800d3abb747d0f1f3dc8f67777efb9631c18e0
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 9353792f6dbd624a1d55cf1e87fa848e8fbaea71)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0b800d3abb747d0f1f3dc8f67777efb9631c18e0)
@@ -406,11 +406,14 @@
  *************************************************************************/
 void signalDialInPumpHardStop( void )
 {
-    targetDialInFlowRate = 0;
-    stopDialInPump();
-    dialInPumpState = DIAL_IN_PUMP_OFF_STATE;
+    dialInPumpControlMode = PUMP_CONTROL_MODE_OPEN_LOOP;
+    dialInPumpDirection = MOTOR_DIR_FORWARD;
     dialInPumpPWMDutyCyclePct = DIP_PWM_ZERO_OFFSET;
+    dialInPumpState = DIAL_IN_PUMP_OFF_STATE;
     dipControlTimerCounter = 0;
+    targetDialInFlowRate = 0;
+    resetDialInFlowMovingAverage();
+    stopDialInPump();
     resetPIController( PI_CONTROLLER_ID_DIALYSATE_FLOW, MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE );
 }