Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r5b448e81db260e5b041699a83c6f2a3faa260ea9 -rad4d98e7d69ee6320a7ab573c353cd6ff92a76fe
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 5b448e81db260e5b041699a83c6f2a3faa260ea9)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision ad4d98e7d69ee6320a7ab573c353cd6ff92a76fe)
@@ -168,10 +168,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 );
     }