Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -rba0335ef18c7859109251f130178acc785c1d39e
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision cea079b61dbd17b2ddaec99b1124248147d14e72)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision ba0335ef18c7859109251f130178acc785c1d39e)
@@ -699,13 +699,13 @@
         {
             areTempSensorsInRange = TRUE;
 #ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT
-            // Turn on the concentrate pumps
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
-
             // Turn the pumps on in reverse
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
+
+            // Turn on the concentrate pumps
+            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
+            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
 #endif
             concentratePumpsPrimeTimer = getMSTimerCount();
         }
@@ -1627,13 +1627,13 @@
             // Turn on the drain pump to drain R2
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 #ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT
-            // Turn on the concentrate pumps
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
-
             // Turn the pumps on in reverse
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
+
+            // Turn on the concentrate pumps
+            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
+            requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
 #endif
 
             // This is the last drain of heat disinfect cycle
@@ -2022,14 +2022,14 @@
         {
             heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1;
 #ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT
+            // Turn the pumps on in reverse
+            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
+            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
+
             // During R1 to R2 disinfect, concentrate pump is run
             // Turn on the concentrate pumps
             requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
             requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
-
-            // Turn the pumps on in reverse
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID,   CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN );
 #endif
         }
         else