Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r05019ca03114d75099dd3ae6e09f776bd8a2c46e -r7ce76ebd80b818d51dc61fd7f0c0fe94a242d182
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 05019ca03114d75099dd3ae6e09f776bd8a2c46e)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 7ce76ebd80b818d51dc61fd7f0c0fe94a242d182)
@@ -606,9 +606,8 @@
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
         // If the inlet temperature and conductivity are in range, move onto the next state
-        if (TRUE)
-        //if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
-        //     ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
+        if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
+             ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -625,10 +624,9 @@
         // Couldn't get a good water sample after a couple of trials and the disinfect cycle failed
         else
         {
-            // DEBUG_DENALI
-            //alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT;
-            //prevHeatDisinfectState = state;
-            //state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT;
+            prevHeatDisinfectState = state;
+            state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
         }
     }