Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rf73db01f3c0cb623b6e56da43ccfba2d922717c5 -rd9fd9d0557d5a158d01e8950316c58d0f7e8a25f
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision f73db01f3c0cb623b6e56da43ccfba2d922717c5)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d9fd9d0557d5a158d01e8950316c58d0f7e8a25f)
@@ -54,9 +54,9 @@
 
 #ifdef DIALYZER_REPRIME_ENABLED
 // Dialyzer reprime constants
-static const U32 DIALYZER_REPRIME_INTERVAL      = ((5 * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);  // TODO - temporary set to 5 min for testing - restore to 30 min
+static const U32 DIALYZER_REPRIME_INTERVAL      = ((30 * SEC_PER_MIN * MS_PER_SECOND) / TASK_GENERAL_INTERVAL);
 /// Dialyzer reprime interval count. Time between reprime attempts.
-#define DIALYZER_REPRIME_REPRIME_DURATION_MS                ( 40 * MS_PER_SECOND )   ///< Duration of dialyzer reprime reprime state.
+#define DIALYZER_REPRIME_REPRIME_DURATION_MS                ( 35 * MS_PER_SECOND )   ///< Duration of dialyzer reprime reprime state.
 #define DIALYZER_REPRIME_PURGE_PRIOR_1_DURATION_MS          ( 10 * MS_PER_SECOND )   ///< Duration of dialyzer reprime purge prior 1 state.
 #define DIALYZER_REPRIME_PURGE_PRIOR_2_DURATION_MS          ( 6  * MS_PER_SECOND )   ///< Duration of dialyzer reprime purge prior 2 state.
 #define DIALYZER_REPRIME_PURGE_LINES_DURATION_MS            ( 10 * MS_PER_SECOND )   ///< Duration of dialyzer reprime purge prior 2 state.
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rf73db01f3c0cb623b6e56da43ccfba2d922717c5 -rd9fd9d0557d5a158d01e8950316c58d0f7e8a25f
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision f73db01f3c0cb623b6e56da43ccfba2d922717c5)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision d9fd9d0557d5a158d01e8950316c58d0f7e8a25f)
@@ -740,11 +740,19 @@
     TREATMENT_STATE_T result = TREATMENT_DIALYSIS_STATE;
     U32 newTime = getMSTimerCount();
     U32 msSinceLast = calcTimeBetween( lastTreatmentTimeStamp, newTime );
+    DIALYSIS_STATE_T dialysisState = getDialysisState();
 
     // Update treatment time (unless delivering a saline bolus)
-    if ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE )
+    if ( dialysisState != DIALYSIS_SALINE_BOLUS_STATE )
     {
+#ifdef DIALYZER_REPRIME_ENABLED
+        if ( dialysisState != DIALYSIS_DIALYZER_REPRIME_STATE )
+        {
+#endif
         treatmentTimeMS += msSinceLast;
+#ifdef DIALYZER_REPRIME_ENABLED
+        }
+#endif
     }
     lastTreatmentTimeStamp = newTime;