Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r109ee17a1d5a729df23854809051aee23fa95ce7 -r4b22b45e775c0525bc1d76e83e265af91a59785e
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 109ee17a1d5a729df23854809051aee23fa95ce7)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 4b22b45e775c0525bc1d76e83e265af91a59785e)
@@ -633,17 +633,8 @@
 void signalReservoirsSwitched( void )
 {
     DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    DG_RESERVOIR_ID_T inactiveRes;
+    DG_RESERVOIR_ID_T inactiveRes = ( activeRes == DG_RESERVOIR_1 ? DG_RESERVOIR_2 : DG_RESERVOIR_1 );
 
-    // get volume of inactive reservoir
-    if ( DG_RESERVOIR_2 == activeRes )
-    {
-        inactiveRes = DG_RESERVOIR_1;
-    }
-    else
-    {
-        inactiveRes = DG_RESERVOIR_2;
-    }
     // update UF volume from prior reservoirs per tentative res volume for last reservoir
     measUFVolumeFromPriorReservoirs += ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );
 }
@@ -676,7 +667,7 @@
         resVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_2_PRIMARY );
     }
 
-    // update UF volume from prior reservoirs per final res volume for last reservoir a bit after we've switched
+    // update UF volume from prior reservoirs per final res volume for last reservoir a bit after we've switched and reservoir has settled
     measUFVolumeFromPriorReservoirs -= ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );
     resFinalVolume[ inactiveRes ] = resVolume;
     measUFVolumeFromPriorReservoirs += ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );