Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r5592e4935a3280fcba66399dbc7c6b5a0afde60a -r2d4653fb5bd6b087b5e17d143b55249b7142fa07
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 5592e4935a3280fcba66399dbc7c6b5a0afde60a)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 2d4653fb5bd6b087b5e17d143b55249b7142fa07)
@@ -107,6 +107,9 @@
  *************************************************************************/
 U32 transitionToGenIdleMode( void )
 {
+    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 );
+
     // Re-initialize each time we transition to generation idle mode
     initGenIdleMode();
     setCurrentSubState( NO_SUB_STATE );
@@ -124,8 +127,8 @@
     setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
 
     signalDrainPumpHardStop();
-    requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
-    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
+    requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, cp1parkStatus );
+    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, cp2parkStatus );
 
     // UV reactors on
     turnOnUVReactor( INLET_UV_REACTOR );