Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rfcaca0915c314d04b9fa96c1960d32b63ab877db -r19ddae332910253204721af6204594467096f468
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision fcaca0915c314d04b9fa96c1960d32b63ab877db)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 19ddae332910253204721af6204594467096f468)
@@ -876,7 +876,13 @@
  *************************************************************************/
 static void failChemicalDisinfectFlush( void )
 {
-    SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevChemDisinfectFlushState )
+    // In the cleaning modes the alarms are triggered but the mode is not transitioned to fault automatically
+    // so transition to fault mode is done here
+    if ( alarmDetectedPendingTrigger != ALARM_ID_NO_ALARM )
+    {
+        SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, prevChemDisinfectFlushState )
+    }
+    requestNewOperationMode( DG_MODE_FAUL );
 }
 
 /*********************************************************************//**