diff --git a/files/macros/fans-control.cfg b/files/macros/fans-control.cfg
index f0f9960..65c1c25 100644
--- a/files/macros/fans-control.cfg
+++ b/files/macros/fans-control.cfg
@@ -54,9 +54,21 @@ shutdown_value: 0.0
 [gcode_macro M141]
 description: Set Chamber Temperature with slicers
 gcode:
-  {% set s = params.S|float %}
-  SET_TEMPERATURE_FAN_TARGET TEMPERATURE_FAN=chamber_fan TARGET={s}
-  RESPOND TYPE=command MSG="Chamber target temperature: {s}°C"
+  {% if 'S' in params|upper %}
+    {% if printer["temperature_fan chamber_fan"].speed > 0.0 %}
+      SET_PIN PIN=fan1 VALUE=255
+    {% else %}
+      SET_PIN PIN=fan1 VALUE=0
+    {% endif %}
+    {% if params.S|int > 0 %}
+      SET_TEMPERATURE_FAN_TARGET TEMPERATURE_FAN=chamber_fan TARGET={params.S|default(35)}
+    {% else %}
+      SET_TEMPERATURE_FAN_TARGET TEMPERATURE_FAN=chamber_fan TARGET=35
+      {% if params.S|int == 0 %}
+        SET_PIN PIN=fan1 VALUE=0
+      {% endif %}
+    {% endif %}
+  {% endif %}
 
 
 [gcode_macro M191]