Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rddad43bbd6e1708cbb3cf27be80299781f1749cc -r719abb7d9989e83f750406bb8e284eca8b09f2c7
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision ddad43bbd6e1708cbb3cf27be80299781f1749cc)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 719abb7d9989e83f750406bb8e284eca8b09f2c7)
@@ -883,10 +883,11 @@
 
         if ( TRUE == isCD2OutOfRange )
         {
+            stateTimer = getMSTimerCount();
+
             if ( ++stateTrialCounter >= MAX_ALLOWED_DISINFECTANT_FLUSH_PERIODS )
             {
-                stateTimer = getMSTimerCount();
-                state      = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+                state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
             }
         }
         else