diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp
index 1a37cecb47..35bda428f7 100644
--- a/Marlin/planner.cpp
+++ b/Marlin/planner.cpp
@@ -440,10 +440,8 @@ void check_axes_activity()
   unsigned char e_active = 0;
   unsigned char tail_fan_speed = fanSpeed;
   #ifdef BARICUDA
-  unsigned char valve_pressure = 0;
-  unsigned char e_to_p_pressure = 0;
-  unsigned char tail_valve_pressure = 0;
-  unsigned char tail_e_to_p_pressure = 0;
+  unsigned char tail_valve_pressure = ValvePressure;
+  unsigned char tail_e_to_p_pressure = EtoPPressure;
   #endif
   block_t *block;
 
@@ -499,31 +497,11 @@ void check_axes_activity()
 
 #ifdef BARICUDA
   #if HEATER_1_PIN > -1
-    if (ValvePressure != 0){
-      analogWrite(HEATER_1_PIN,ValvePressure); // If buffer is empty use current valve pressure
-    }
-
-    if((ValvePressure == 0) && (valve_pressure ==0)) {
-      analogWrite(HEATER_1_PIN, 0);
-    }
-
-    if (ValvePressure != 0 && tail_valve_pressure !=0) { 
       analogWrite(HEATER_1_PIN,tail_valve_pressure);
-    }
   #endif
 
   #if HEATER_2_PIN > -1
-    if (EtoPPressure != 0){
-      analogWrite(HEATER_2_PIN,EtoPPressure); // If buffer is empty use current EtoP pressure
-    }
-
-    if((EtoPPressure == 0) && (e_to_p_pressure ==0)) {
-      analogWrite(HEATER_2_PIN, 0);
-    }
-
-    if (EtoPPressure != 0 && tail_e_to_p_pressure !=0) { 
       analogWrite(HEATER_2_PIN,tail_e_to_p_pressure);
-    }
   #endif
 #endif
 }