Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rd60790939c496145d0c61f9698613bc729bebfed -r95a629a369766d5af61479c9e306ebbdf6475aa6
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision d60790939c496145d0c61f9698613bc729bebfed)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 95a629a369766d5af61479c9e306ebbdf6475aa6)
@@ -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 );
@@ -123,9 +126,6 @@
     // 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, cp1parkStatus );
     requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, cp2parkStatus );