Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r6623684ddacf5beebd15bce8a1dbd06a442fb38e -r29a2c3c7d7618489c0ada9f98e1d30226b455392
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 6623684ddacf5beebd15bce8a1dbd06a442fb38e)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 29a2c3c7d7618489c0ada9f98e1d30226b455392)
@@ -911,24 +911,27 @@
     BOOL const dialysateTempRecovered = fabs( dgDialysateTemp - dgTrimmerTempSet ) < DIALYSATE_TEMP_RECOVERY_TOLERANCE_C ? TRUE : FALSE;
 
 #ifndef DISABLE_DIALYSATE_TEMP_CHECK
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dgTrimmerTempSet, dgDialysateTemp );
-    }
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dgTrimmerTempSet, dgDialysateTemp );
+        }
 
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateLowTemp ) )
-    {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dgTrimmerTempSet, dgDialysateTemp );
-    }
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateLowTemp ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dgTrimmerTempSet, dgDialysateTemp );
+        }
 
-    if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
-    {
-        clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH );
-    }
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, dialysateHighTemp ) )
+        {
+            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_HIGH );
+        }
 
-    if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateTempRecovered ) )
-    {
-        clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_DIALYSATE_TEMPERATURE_LOW, dialysateTempRecovered ) )
+        {
+            clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
+        }
     }
 #endif
 }