Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r8b73263b38f449dacc0795c67a7cf6240cb79026 -r20c90ee790deb7a38da44f948fef5b34d541d930
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 8b73263b38f449dacc0795c67a7cf6240cb79026)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 20c90ee790deb7a38da44f948fef5b34d541d930)
@@ -629,6 +629,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_DG_FLUSH_IN_PROGRESS_STATE;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DISINFECT_FLUSH, 0 );
     }
 
     return state;
@@ -650,6 +651,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        clearAlarm( ALARM_ID_HD_DISINFECT_FLUSH );
     }
 
     publishDisinfectData();
@@ -705,6 +707,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DISINFECT_HEAT, 0 );
     }
 
     return state;
@@ -726,6 +729,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        clearAlarm( ALARM_ID_HD_DISINFECT_HEAT );
     }
 
     publishDisinfectData();
@@ -782,6 +786,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE;
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DISINFECT_CHEM, 0 );
     }
 
     return state;
@@ -803,6 +808,7 @@
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         state            = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        clearAlarm( ALARM_ID_HD_DISINFECT_CHEM );
     }
 
     publishDisinfectData();