Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -r7f2eeacf92517b16c899b5b831a2fff083139471
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 7f2eeacf92517b16c899b5b831a2fff083139471)
@@ -637,7 +637,8 @@
 
     // Wait for the reservoir to settle and then send the commands to switch the active reservoir
     if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_FRESH_SETTLE_TIME_MS ) ) &&
-       ( ( dilutionLevelPct >= MAX_RESERVOIR_DILUTION ) || ( volSpentML >= (F32)getTargetFillVolumeBasedOnDialysateFlowML() ) || ( TRUE == isDialysateTempAlarmActive() ) ) )
+       ( ( dilutionLevelPct >= MAX_RESERVOIR_DILUTION ) || ( volSpentML >= (F32)getTargetFillVolumeBasedOnDialysateFlowML() ) ||
+         ( TRUE == isDialysateTempAlarmActive() ) || ( TRUE == isAlarmActive( ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE ) ) ) )
     {
         DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;