diff --git a/macros/base/cancel_print.cfg b/macros/base/cancel_print.cfg
index 70fb00ca..1daf9ce1 100644
--- a/macros/base/cancel_print.cfg
+++ b/macros/base/cancel_print.cfg
@@ -8,11 +8,13 @@ gcode:
     {% set klippain_mmu_enabled = printer["gcode_macro _USER_VARIABLES"].klippain_mmu_enabled %}
     {% set mmu_unload_on_cancel_print = printer["gcode_macro _USER_VARIABLES"].mmu_unload_on_cancel_print %}
     {% set filter_enabled = printer["gcode_macro _USER_VARIABLES"].filter_enabled %}
+    {% set exhaust_enabled = printer["gcode_macro _USER_VARIABLES"].exhaust_enabled %}
     {% set light_enabled = printer["gcode_macro _USER_VARIABLES"].light_enabled %}
     {% set status_leds_enabled = printer["gcode_macro _USER_VARIABLES"].status_leds_enabled %}
     {% set bed_mesh_enabled = printer["gcode_macro _USER_VARIABLES"].bed_mesh_enabled %}
     {% set filament_sensor_enabled = printer["gcode_macro _USER_VARIABLES"].filament_sensor_enabled %}
     {% set filter_default_time = printer["gcode_macro _USER_VARIABLES"].filter_default_time_on_end_print|default(600)|int %}
+    {% set exhaust_filter_default_time = printer["gcode_macro _USER_VARIABLES"].filter_exhaust_default_time_on_end_print|default(600)|int %}
     {% set hotend_fan_tach_enabled = printer["gcode_macro _USER_VARIABLES"].hotend_fan_tach_enabled %}
 
     PARK
@@ -58,6 +60,12 @@ gcode:
             UPDATE_DELAYED_GCODE ID=_STOP_FILTER_DELAYED DURATION={FILTER_TIME}
         {% endif %}
     {% endif %}
+    #Same for exhaust filter
+     {% if exhaust_enabled %}
+        {% set EXHAUST_TIME = params.FILTER_TIME|default(exhaust_filter_default_time)|int %}
+        START_EXHAUST SPEED=1
+        UPDATE_DELAYED_GCODE ID=_STOP_EXHAUST_DELAYED DURATION={EXHAUST_TIME}
+    {% endif %}
 
     {% if light_enabled %}
         LIGHT_ON S={light_intensity_end_print}
diff --git a/macros/base/end_print.cfg b/macros/base/end_print.cfg
index 90fd2216..ae39fdee 100644
--- a/macros/base/end_print.cfg
+++ b/macros/base/end_print.cfg
@@ -66,6 +66,12 @@ gcode:
             UPDATE_DELAYED_GCODE ID=_STOP_FILTER_DELAYED DURATION={FILTER_TIME}
         {% endif %}
     {% endif %}
+    #Same for exhaust filter
+     {% if exhaust_enabled %}
+        {% set EXHAUST_TIME = params.FILTER_TIME|default(exhaust_filter_default_time)|int %}
+        START_EXHAUST SPEED=1
+        UPDATE_DELAYED_GCODE ID=_STOP_EXHAUST_DELAYED DURATION={EXHAUST_TIME}
+    {% endif %}
 
     {% if light_enabled %}
         LIGHT_ON S={light_intensity_end_print}