Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r4fbbd781e7a363b7f5838238e4fc7be29ab99b65 -r4775393f56231d54035908134c7fd1f4c76d019c
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 4fbbd781e7a363b7f5838238e4fc7be29ab99b65)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 4775393f56231d54035908134c7fd1f4c76d019c)
@@ -618,15 +618,35 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        if ( getMeasuredRawFlowRateLPM( DIALYSATE_FLOW_SENSOR ) > NEARLY_ZERO )
+        DG_OP_MODE_T op = getCurrentOperationMode();
+
+        switch ( op )
         {
-            F32 TDi         = dialTempMovingAvgData[ DIAL_TEMP_TDI ].dialTempAvgC;
-            F32 TRo         = dialTempMovingAvgData[ DIAL_TEMP_TRO ].dialTempAvgC;
-            DG_OP_MODE_T op = getCurrentOperationMode();
-            F32 driftC      = ( DG_MODE_HEAT == op ? TDI_TRO_TEMP_SENSORS_MAX_DEVIATION_IN_HEAT_DIS_C : TDI_TRO_TEMP_SENSORS_MAX_DEVIATION_C );
-            BOOL isDriftOut = ( fabs( TDi - TRo ) > driftC ? TRUE : FALSE );
+            case DG_MODE_GENE:
+            case DG_MODE_FILL:
+            case DG_MODE_DRAI:
+            case DG_MODE_HEAT:
+            case DG_MODE_CHEM:
+                if ( getMeasuredRawFlowRateLPM( DIALYSATE_FLOW_SENSOR ) > NEARLY_ZERO )
+                {
+                    F32 TDi         = dialTempMovingAvgData[ DIAL_TEMP_TDI ].dialTempAvgC;
+                    F32 TRo         = dialTempMovingAvgData[ DIAL_TEMP_TRO ].dialTempAvgC;
+                    F32 driftC      = ( DG_MODE_HEAT == op ? TDI_TRO_TEMP_SENSORS_MAX_DEVIATION_IN_HEAT_DIS_C : TDI_TRO_TEMP_SENSORS_MAX_DEVIATION_C );
+                    BOOL isDriftOut = ( fabs( TDi - TRo ) > driftC ? TRUE : FALSE );
 
-            checkPersistentAlarm( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut, fabs( TDi - TRo ), driftC );
+                    checkPersistentAlarm( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, isDriftOut, fabs( TDi - TRo ), driftC );
+                }
+                break;
+
+            case DG_MODE_FLUS:
+            case DG_MODE_CHFL:
+            case DG_MODE_HCOL:
+            case DG_MODE_ROPS:
+                // Do not raise alarm (ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE) in these modes.
+                break;
+
+            default:
+                break;
         }
     }
 }