Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r9df8618dfd95d3af354e6cbb590ebe6f6fd7ccdd -rf7b149d8b8c9ea6ac58e4739101693d251d7a355
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 9df8618dfd95d3af354e6cbb590ebe6f6fd7ccdd)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision f7b149d8b8c9ea6ac58e4739101693d251d7a355)
@@ -1119,15 +1119,15 @@
  * is the inactive reservoir) in order to get a more stable volume.
  * @details Inputs: active reservoir, load cell reading from inactive reservoir
  * @details Outputs: resStartVolume[]
+ * @param reservoirID reservoir ID to update the baseline volume.
  * @return none
  *************************************************************************/
-void setStartReservoirVolume( void )
+void setStartReservoirVolume( DG_RESERVOIR_ID_T reservoirID )
 {
-    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
-    F32 resVolume = getReservoirWeightLargeFilter( inactiveRes );
+    F32 resVolume = getReservoirWeightLargeFilter( reservoirID );
 
     // Set starting baseline volume for next reservoir before we switch to it
-    resStartVolume[ inactiveRes ] = resVolume;
+    resStartVolume[ reservoirID ] = resVolume;
 }
 
 /*********************************************************************//**
@@ -1141,8 +1141,7 @@
  *************************************************************************/
 void signalReservoirsSwitched( void )
 {
-    DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    DG_RESERVOIR_ID_T inactiveRes = ( activeRes == DG_RESERVOIR_1 ? DG_RESERVOIR_2 : DG_RESERVOIR_1 );
+    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
 
     // Update UF volume from prior reservoirs per tentative res volume for last reservoir
     measUFVolumeFromPriorReservoirs += ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );