Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r3414e47b2664c56ab6b2f0cd5cd6b30ae9a5e333 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 3414e47b2664c56ab6b2f0cd5cd6b30ae9a5e333)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -606,13 +606,23 @@
     // Check if flush time has elapsed
     if ( TRUE == didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
-#ifndef DISABLE_DISINFECT_CONDUCTIVITY
+        BOOL hasConductivityPassed = FALSE;
+
         // If the inlet temperature and conductivity are in range, move onto the next state
         if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
-#else
-        if ( TRUE )
+        {
+            hasConductivityPassed = TRUE;
+        }
+
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            hasConductivityPassed = TRUE;
+        }
 #endif
+
+        if ( TRUE == hasConductivityPassed )
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -991,15 +1001,13 @@
     // Set the chemical disinfect that is published on the UI
     chemDisinfectUIState = CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID;
 
-#ifndef DISABLE_DISINFECT_CONDUCTIVITY
     F32 cd2Conductivity = getConductivityValue( (U32)CONDUCTIVITYSENSORS_CD2_SENSOR );
 
     if ( cd2Conductivity <= MIN_ACID_CONDUCTIVITY_US_PER_CM )
     {
         primeAcidSteadyStateCounter = 0;
     }
     else
-#endif
     {
         // Check if the acid conductivity value has been
         if ( ++primeAcidSteadyStateCounter >= PRIME_ACID_STEADY_CONDUCTIVITY_TIME_MS )