Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rbecd984764c6f1737369fc7078059c46809f1864 -r1d97505ddf46e07f45bcc3d54c8a3654912f1fdf
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision becd984764c6f1737369fc7078059c46809f1864)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1d97505ddf46e07f45bcc3d54c8a3654912f1fdf)
@@ -1171,9 +1171,14 @@
             break;
 
         case HEAT_DISINFECT_HEAT_UP_IN_PROGRESS:
+            heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER;
+            break;
+
+#ifndef _VECTORCAST_
         default:
             heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER;
             break;
+#endif
     }
 
     return state;
@@ -1890,7 +1895,7 @@
             {
                 stopHeater( DG_TRIMMER_HEATER );
             }
-            else if ( ( TDiTempC < HEAT_DISINFECT_TRIMMER_HEATER_STOP_TEMP_C ) && ( FALSE == isHeaterOn( DG_TRIMMER_HEATER ) ) )
+            else if ( FALSE == isHeaterOn( DG_TRIMMER_HEATER ) )
             {
                 setHeaterTargetTemperature( DG_TRIMMER_HEATER, HEAT_DISINFECT_TRIM_HEATER_TARGET_TEMP_C );
                 startHeater( DG_TRIMMER_HEATER );