Index: firmware/App/Controllers/PermeateTank.c
===================================================================
diff -u -rb569bc796c56acd5d94d468386f5f42c350cad65 -rccdab403fc0fb315e52857ac7968ab5185aa55b7
--- firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision b569bc796c56acd5d94d468386f5f42c350cad65)
+++ firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision ccdab403fc0fb315e52857ac7968ab5185aa55b7)
@@ -309,11 +309,21 @@
         case PERMEATE_TANK_FULL_STATE:
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
             setValveState( M12_VALV, VALVE_STATE_OPEN );
-            setValveState( P6_VALV, VALVE_STATE_OPEN );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P39_VALV, VALVE_STATE_CLOSED );
             // set P33, P34 and P37 per recovery configuration
             setRecoveryValvesConfig();
+            // No recirculation for no recovery setting.
+            if ( getRecoveryStatesConfig() != NO_RECOVERY )
+            {
+                setValveState( P6_VALV, VALVE_STATE_OPEN );
+                setValveState( P39_VALV, VALVE_STATE_CLOSED );
+            }
+            else
+            {
+                setValveState( P6_VALV, VALVE_STATE_CLOSED );
+                setValveState( P39_VALV, VALVE_STATE_OPEN );
+            }
             break;
 
         default: