Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -r9226e7b5b52c30057e93453ced523f563fbd89fe
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9226e7b5b52c30057e93453ced523f563fbd89fe)
@@ -917,13 +917,16 @@
  *************************************************************************/
 static void failChemicalDisinfectFlush( void )
 {
+    // If a fault alarm is active go to mode fault otherwise for cleaning mode alarms, transition to standby
+    DG_OP_MODE_T nextOpMode = ( FALSE == isDGFaultAlarmActive() ? DG_MODE_STAN : DG_MODE_FAUL );
+
     // 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_STAN );
+    requestNewOperationMode( nextOpMode );
 }
 
 /*********************************************************************//**