Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -rfafeb76a9e02672f4a03bc8c35a2b09950ff736f
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision fafeb76a9e02672f4a03bc8c35a2b09950ff736f)
@@ -1045,7 +1045,9 @@
         // If either the dialysate cap or the concentrate cap is open during any state, alarm
         if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == dialysateCap ) )
         {
-            if ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_START )
+            if ( ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_START ) &&
+                 ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH ) &&
+                 ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH ) )
             {
                 prevChemDisinfectFlushState = chemDisinfectFlushState;
                 chemDisinfectFlushState     = DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH;