Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r8483d8dd3ceccefc737eac09f1e2bef772f22a06 -r9226e7b5b52c30057e93453ced523f563fbd89fe
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 8483d8dd3ceccefc737eac09f1e2bef772f22a06)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 9226e7b5b52c30057e93453ced523f563fbd89fe)
@@ -1326,14 +1326,17 @@
  *************************************************************************/
 static void failChemicalDisinfect( 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, prevChemDisinfectState )
     }
 
-    requestNewOperationMode( DG_MODE_STAN );
+    requestNewOperationMode( nextOpMode );
 }
 
 /*********************************************************************//**