Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r0f68c8f7dadf2a493aed0d123a10a42474b7b7cb -re14e14eedeb52b901618222bb59320b955bf7f5a
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 0f68c8f7dadf2a493aed0d123a10a42474b7b7cb)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision e14e14eedeb52b901618222bb59320b955bf7f5a)
@@ -173,10 +173,8 @@
     checkReservoirMaxVolume();
     calculateActiveReservoirCycleTime();
 
-    // TODO do we need this? Should we not call the reservoir management exec function in saline bolus?
-
-    // Calculate volume used from active reservoir - do not accumulate if saline bolus is in progress
-    if (  getSalineBolusState() != SALINE_BOLUS_STATE_IN_PROGRESS )
+    // Calculate volume used from active reservoir - do not accumulate if not performing dialysis or saline bolus is in progress
+    if ( ( TREATMENT_DIALYSIS_STATE == getTreatmentState() ) && ( getDialysisState() != DIALYSIS_SALINE_BOLUS_STATE ) )
     {
         volSpentML += ( flowRateMLPerMS * msSinceLastVolumeCalc );