Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r6c86a89b9ad26a73adc44422ac029dc09b50ccd5 -rc1715082687d81acb67b7d27bceedc648fc9b260
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 6c86a89b9ad26a73adc44422ac029dc09b50ccd5)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision c1715082687d81acb67b7d27bceedc648fc9b260)
@@ -651,7 +651,8 @@
         rsrvrCmd.reservoirID            = (U32)inactiveRes;
         rsrvrCmd.useLastTrimmerHeaterDC = TRUE;
 
-        if ( ( dilutionLevelPct >= MAX_RESERVOIR_DILUTION ) || ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML ) || ( getReservoirWeight( active ) > MAX_RESERVOIR_VOL_BEFORE_SWITCH_ML ) )
+        if ( ( dilutionLevelPct >= MAX_RESERVOIR_DILUTION ) || ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML ) ||
+             ( getReservoirWeight( active ) > MAX_RESERVOIR_VOL_BEFORE_SWITCH_ML ) || TRUE == isDialysateTempAlarmActive() )
         {
             // Signal dialysis sub-mode to capture baseline volume for next reservoir.
             setStartReservoirVolume( inactiveRes );
@@ -670,25 +671,6 @@
 
             state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
         }
-        else if ( TRUE == isDialysateTempAlarmActive() )
-        {
-            // Signal dialysis sub-mode to capture baseline volume for next reservoir.
-            setStartReservoirVolume( inactiveRes );
-
-            // Command DG to switch reservoirs
-            cmdSetDGActiveReservoir( &rsrvrCmd );
-
-            // Signal dialysis sub-mode to switch reservoirs
-            signalReservoirsSwitched();
-
-            // Get ready for the next delivery
-            volSpentML = 0.0;
-
-            // Wait for used reservoir to settle
-            reservoirSwitchStartTimeMS = getMSTimerCount();
-
-            state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
-        }
     }
 
     return state;