Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rd2d64fea6a4c1a1e0ceba42396b5e9c2483090e3 -r804715137aae49c89ffb871ba561d7498d19108a
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d2d64fea6a4c1a1e0ceba42396b5e9c2483090e3)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 804715137aae49c89ffb871ba561d7498d19108a)
@@ -712,6 +712,10 @@
         }
     }
 
+    // NOTE: do not move this function this function needs to be after the check for blood leak zeroing logic above.
+    // If the blood leak logic is no longer needed, the reset function below can be removed.
+    resetReservoirSwitchFlag();
+
     // Dialysis state machine
     switch ( currentDialysisState )
     {
@@ -1337,6 +1341,7 @@
         data.bolSalineVolumeMl                      = bolusSalineVolumeDelivered_mL;
         data.bloodLeakZeroingDPi2BLDFlushVolumeML   = bloodLeakZeroingStatus.DPi2BLDFlushedVolML;
         data.bloodLeakZeroingRsrvr2DPiFlushVolumeML = bloodLeakZeroingStatus.rsrvr2DPiFlushedVolML;
+        data.bloodLeakZeroingNeededAfterRsrvrSwitch = bloodLeakZeroingStatus.isZeroingNeededAfterRsrvrSwitch;
 
         broadcastData( MSG_ID_SALINE_BOLUS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SALINE_BOLUS_DATA_PAYLOAD_T ) );
         salineBolusBroadcastTimerCtr = 0;