Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r9d924ec76ce770eb2a94088bfe37bfb0e30981a8 -r709def41bcde8e2e59d83c5e9c5a06ab0ee74ec8
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9d924ec76ce770eb2a94088bfe37bfb0e30981a8)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 709def41bcde8e2e59d83c5e9c5a06ab0ee74ec8)
@@ -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;
 
@@ -1423,6 +1431,11 @@
         payload.txEndState = getCurrentTreatmentEndState();
         payload.heparinState = getHeparinState();
         payload.dialysisState = getDialysisState();
+#ifdef DIALYZER_REPRIME_ENABLED
+        payload.dlzReprimeState = getDialyzerRePrimeState();
+#else
+        payload.dlzReprimeState = 0;
+#endif
 
         broadcastData( MSG_ID_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TREATMENT_STATE_DATA_T ) );
         treatmentStateBroadcastTimerCtr = 0;