Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rdb291cc22fd8f10e6e47cad468e14ed5590a94f2 -rebf60bac3059aadf280c8bdb2c50746d8fdb910a
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision db291cc22fd8f10e6e47cad468e14ed5590a94f2)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision ebf60bac3059aadf280c8bdb2c50746d8fdb910a)
@@ -1271,6 +1271,8 @@
     BOOL isTempBelowTrigger            = (BOOL)( isTDITempBelowLowSafety || isTDiTempBelowDialysateTarget );
     BOOL isTempAboveTrigger            = (BOOL)( isTDiTempAboveLowSafety || isTDiTempAboveDialysateTarget );
 
+    if ( getTargetDialInFlowRate() >  0 )
+    {
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
 #endif
@@ -1294,6 +1296,13 @@
         }
         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 **********