Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r72ac4f83f53180e816a65eeddd62ea1015b8c4d3 -r7d0fd5ed6b9db0479af90477e5108f6d3fa8df17
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 72ac4f83f53180e816a65eeddd62ea1015b8c4d3)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 7d0fd5ed6b9db0479af90477e5108f6d3fa8df17)
@@ -9,7 +9,7 @@
 * @file    ModeGenIdle.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      06-Mar-2024
+* @date    (last)      09-Apr-2024
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Aug-2021
@@ -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 );