Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r6982379266891326c9d45aecd7d54ad5c85ea69f -r95561ae1f450dc687b9ce8d4cce2ac91293bc925
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 6982379266891326c9d45aecd7d54ad5c85ea69f)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 95561ae1f450dc687b9ce8d4cce2ac91293bc925)
@@ -565,7 +565,7 @@
  * @brief
  * The handleReservoirMgmtWaitForFillSettleState function executes the reservoir
  * management wait for fill to settle state.
- * @details Inputs: reservoirSwitchTimer
+ * @details Inputs: reservoirSwitchTimer, volSpentML
  * @details Outputs: reservoirSwitchTimer, volSpentML
  * @return next reservoir management state of the state machine
  *************************************************************************/
@@ -574,7 +574,7 @@
     TREATMENT_RESERVOIR_MGMT_STATE_T state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE;
 
     // Wait for the reservoir to settle and then send the commands to switch the active reservoir
-    if ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_SETTLE_TIME_MS ) )
+    if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_SETTLE_TIME_MS ) ) && ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML ) )
     {
         DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();