Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r5957402b2eefa8a803cc60f108eeda397e828c34 -rd60790939c496145d0c61f9698613bc729bebfed
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 5957402b2eefa8a803cc60f108eeda397e828c34)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d60790939c496145d0c61f9698613bc729bebfed)
@@ -364,6 +364,8 @@
 #endif
         {
             concentratePumps[ pumpId ].hasTurnOnPumpsBeenRequested = TRUE;
+            acidConcentratePumpParkPersistenceClear                = FALSE;
+            bicarbConcentratePumpParkPersistenceClear              = FALSE;
         }
     }
     else
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rc1d5811ec6c4c0005870ef1fb955eb5b6b2ec27c -rd60790939c496145d0c61f9698613bc729bebfed
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision c1d5811ec6c4c0005870ef1fb955eb5b6b2ec27c)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision d60790939c496145d0c61f9698613bc729bebfed)
@@ -123,9 +123,12 @@
     // Set back the conductivity of CD2 calibration table to the normal calibration table
     setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
 
+    BOOL cp1parkStatus = ( getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID )   != TRUE ? PARK_CONC_PUMPS : NO_PARK_CONC_PUMPS );
+    BOOL cp2parkStatus = ( getConcPumpIsParked( CONCENTRATEPUMPS_CP2_BICARB ) != TRUE ? PARK_CONC_PUMPS : NO_PARK_CONC_PUMPS );
+
     signalDrainPumpHardStop();
-    requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, PARK_CONC_PUMPS );
-    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, PARK_CONC_PUMPS );
+    requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, cp1parkStatus );
+    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, cp2parkStatus );
 
     // UV reactors on
     turnOnUVReactor( INLET_UV_REACTOR );