Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rd182ea22d168c4a6522993f8a0a362586e87e591 -r95327b1ffd45471bd37e514b04074d061a9c2e90
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision d182ea22d168c4a6522993f8a0a362586e87e591)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 95327b1ffd45471bd37e514b04074d061a9c2e90)
@@ -467,7 +467,14 @@
         {
             if ( TEMPSENSORS_HEAT_DISINFECT == sensorIndex )
             {
-                temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues );
+                if ( OVERRIDE_KEY == tempSensors[ TEMPSENSORS_HEAT_DISINFECT ].temperatureValues.override )
+                {
+                    temperature = getF32OverrideValue(  &tempSensors[ TEMPSENSORS_HEAT_DISINFECT ].temperatureValues  );
+                }
+                else
+                {
+                    temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues );
+                }
             }
 
             if ( TEMPSENSORS_INTERNAL_THD_RTD == sensorIndex )
@@ -477,7 +484,14 @@
 
             if ( TEMPSENSORS_OUTLET_REDUNDANT == sensorIndex )
             {
-                temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_INLET_DIALYSATE ].temperatureValues );
+                if ( OVERRIDE_KEY == tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues.override )
+                {
+                    temperature = getF32OverrideValue(  &tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues  );
+                }
+                else
+                {
+                    temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_INLET_DIALYSATE ].temperatureValues );
+                }
             }
         }
 #endif