Index: firmware/App/HDCommon.h
===================================================================
diff -u -r1b1cb4654131c2663e48a3041719fe294bea2a4e -r1bb8bdeedc15bd46233fea67605fb78296b95e5e
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 1b1cb4654131c2663e48a3041719fe294bea2a4e)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 1bb8bdeedc15bd46233fea67605fb78296b95e5e)
@@ -36,7 +36,7 @@
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
-    #define DIALYZER_REPRIME_ENABLED        1           // Build w/o dialyzer reprime code
+    #define DIALYZER_REPRIME_ENABLED        1           // Build with dialyzer reprime code
 
     #include <stdio.h>
     #include <strings.h>
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r572184131cb35ff2aef895797e9f88336225ec6a -r1bb8bdeedc15bd46233fea67605fb78296b95e5e
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 572184131cb35ff2aef895797e9f88336225ec6a)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1bb8bdeedc15bd46233fea67605fb78296b95e5e)
@@ -1214,9 +1214,9 @@
  * The handlePurgePrior2State function handles the purge prior 2 state of the dialyzer reprime
  * state machine.
  * @details Inputs: dialyzerReprimeStateTimer
- * @details Outputs: dialyzerReprimeStateTimer, next dialyzer reprime state
+ * @details Outputs: next dialyzer reprime state
  * @param dialysis state
- * @return next dialyzer reprime state state
+ * @return next dialyzer reprime state
  *************************************************************************/
 static DIALYZER_REPRIME_STATE_T handleDialyzerReprimePurgePrior2State( DIALYSIS_STATE_T *dialysisState )
 {
@@ -1227,15 +1227,9 @@
         // ramp down the pumps to zero before turning them on in reverse
         setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
         setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+        dialyzerReprimeInProgress = FALSE; // This will cause a transition to reprime state after pumps stop
+        result = DIALYZER_REPRIME_STATE_DIALYSATE_PUMPS_OFF;
     }
-    if ( ( FALSE == isDialInPumpRunning() ) && ( FALSE == isDialOutPumpRunning() ) )
-    {
-        setDialInPumpTargetFlowRate( DPI_REPRIME_FLOW_RATE_ML_MIN, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialOutPumpTargetRate( DPO_REPRIME_FLOW_RATE_ML_MIN, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-        dialyzerReprimeStateTimer = getMSTimerCount();
-        result = DIALYZER_REPRIME_STATE_REPRIME;
-    }
-
     return result;
 }