diff --git a/Orbiter2_SmartSensor.cfg b/Orbiter2_SmartSensor.cfg
index a6e8398..cfc4930 100644
--- a/Orbiter2_SmartSensor.cfg
+++ b/Orbiter2_SmartSensor.cfg
@@ -285,7 +285,7 @@ gcode:
     SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=extruder_restore_temp VALUE={printer.extruder.target}
     ##### end of definitions #####
     SAVE_GCODE_STATE NAME=PAUSE_state 
-    SET_IDLE_TIMEOUT TIMEOUT={(sensor.pause_timeout)|float} # increase printer timeout
+    #SET_IDLE_TIMEOUT TIMEOUT={(sensor.pause_timeout)|float} # increase printer timeout
     BASE_PAUSE
     G91
     G1 E-{e} F2100
@@ -314,7 +314,7 @@ gcode:
     G1 E{e} F2100
     G90    
     M118 O2S: Temperatures restored, resmume printing!
-    SET_IDLE_TIMEOUT TIMEOUT=600 # restor klipper default printer timeout to 10 min
+    #SET_IDLE_TIMEOUT TIMEOUT=600 # restor klipper default printer timeout to 10 min
     RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1
     BASE_RESUME    
    # SET_LED LED=OrbiLED RED=1.0 GREEN=1.0 BLUE=1.0
@@ -325,7 +325,7 @@ gcode:
     CLEAR_PAUSE
     #SDCARD_RESET_FILE
     BASE_CANCEL_PRINT 
-    SET_IDLE_TIMEOUT TIMEOUT=600 # restor klipper default printer timeout to 10 min
+    #SET_IDLE_TIMEOUT TIMEOUT=600 # restor klipper default printer timeout to 10 min
 
 [gcode_macro T0]
 gcode:
diff --git a/moonraker-sql.db b/moonraker-sql.db
index 78a7de3..ff7589d 100644
Binary files a/moonraker-sql.db and b/moonraker-sql.db differ
diff --git a/printer.cfg b/printer.cfg
index a0fe08b..cc1bd83 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -792,17 +792,26 @@ gcode:
 [idle_timeout]
 timeout: 1800
 gcode:
-  M84; TURN_OFF_MOTORS
-  TURN_OFF_HEATERS
-  UPDATE_DELAYED_GCODE ID=delayed_printer_off DURATION=60
-  
-[delayed_gcode delayed_printer_off]
-initial_duration: 0.
-gcode:
-  {% if printer.idle_timeout.state == "Idle" %}
-    PRINTER_OFF
+  # In pause state, Only the nozzle is turned OFF
+  {% if printer.print_stats.state == "paused" %}
+    SET_HEATER_TEMPERATURE HEATER=extruder TARGET=0
+  {% else %}
+    # Standby/Idle or complete, can be turned off.
+    M84 ; Motors Off
+    TURN_OFF_HEATERS
+    UPDATE_DELAYED_GCODE ID=delayed_printer_off DURATION=60
   {% endif %}
 
+[delayed_gcode delayed_printer_off]
+initial_duration: 0
+gcode:
+  # Can only be turned off if not paused.
+  {% if printer.idle_timeout.state == "Idle" and printer.print_stats.state != "paused" %}
+    printer_off
+  {% endif %}
+
+
+
 [exclude_object]
 
 [include mainsail.cfg]