Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r4ee60d5c6265f29ff84368ee870404b55718a57a -reac01a2bef801e4ba636eae6e087be93222c680c
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision eac01a2bef801e4ba636eae6e087be93222c680c)
@@ -760,7 +760,8 @@
         }
     }
     // Check if the acid conductivity value has been above the threshold for the specified time period
-    if ( ++primeAcidSteadyStateCounter >= PRIME_ACID_STEADY_CONDUCTIVITY_TASK_INT )
+    if ( ( ++primeAcidSteadyStateCounter >= PRIME_ACID_STEADY_CONDUCTIVITY_TASK_INT ) ||
+         ( TRUE == getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) ) )
     {
         // Turn off the concentrate pump
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );