Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r43bc98e5b4abf72927130634d71e783cd1bd63d9 -re12f811f0ee96b19d869acee5352778d260e1ac3
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 43bc98e5b4abf72927130634d71e783cd1bd63d9)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision e12f811f0ee96b19d869acee5352778d260e1ac3)
@@ -700,14 +700,14 @@
 
     if ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_USED_SETTLE_TIME_MS ) )
     {
-        // Signal dialysis sub-mode to capture final volume of prior reservoir after settling.
-        setFinalReservoirVolume();
-
-        // Switched the active reservoir so reset the reservoir in use timer
+        // Switching the active reservoir so reset the reservoir in use timer
         lastTimeReservoirInUF = timeReservoirInUF;
         timeReservoirInUF = 0;
         timeReservoirInUse = 0;
 
+        // Signal dialysis sub-mode to capture final volume of prior reservoir after settling.
+        setFinalReservoirVolume();
+
         // Reset to start state to restart drain, fill, switch process.
         state = TREATMENT_RESERVOIR_MGMT_START_STATE;
     }