Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -rf502a589b7a6c39c6fd57ceee778f5c94481af14
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision f502a589b7a6c39c6fd57ceee778f5c94481af14)
@@ -73,7 +73,6 @@
 #define CHEM_DISINFECT_FLUSH_TIME_MS                ( 12 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Chemical disinfect flush time in ms.
 
 // Fill reservoirs to full defines
-#define RESERVOIR_FULL_VOLUME_CHANGE_LIMIT_ML       5.0F                                                       ///< The maximum difference between the short-term and long-term filtered reservoir volumes in ml that determines the reservoir is full.
 #define RESERVOIR_MINIMUM_FULL_VOLUME_ML            1850.0F                                                    ///< When filling the reservoir, the volume reading must be at least this value before checking for the volume to level off.
 #define RSRVRS_FILL_TO_FULL_STABLE_TASK_INT         ( ( 2 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )          ///< Reservoirs 1 & 2 full stable time in task intervals.
 
@@ -917,13 +916,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 );
 }
 
 /*********************************************************************//**