Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -re6ecfc3119487cd10e51be9d5c99d7b4276b9201 -r3835a004a6ef4a31d740d2532a5aba1683fa9d5a
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision e6ecfc3119487cd10e51be9d5c99d7b4276b9201)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 3835a004a6ef4a31d740d2532a5aba1683fa9d5a)
@@ -887,7 +887,9 @@
 
             if ( ++stateTrialCounter >= MAX_ALLOWED_DISINFECTANT_FLUSH_PERIODS )
             {
-                state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+                alarmDetectedPendingTrigger = ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE;
+                prevChemDisinfectState      = state;
+                state                       = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
             }
         }
         else