Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -rc4b276bd7edf7cbcfe0982ccd5703c5571869e59
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision c4b276bd7edf7cbcfe0982ccd5703c5571869e59)
@@ -1271,9 +1271,7 @@
     BOOL isTempBelowTrigger            = (BOOL)( isTDITempBelowLowSafety || isTDiTempBelowDialysateTarget );
     BOOL isTempAboveTrigger            = (BOOL)( isTDiTempAboveLowSafety || isTDiTempAboveDialysateTarget );
 
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+    if ( getTargetDialInFlowRate() >  0 )
     {
         // check clear condition first
         if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) )
@@ -1294,6 +1292,12 @@
         }
         checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet );
     }
+    else
+    {
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet );
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet );
+        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet );
+    }
 }
 
 // ********** private functions **********