diff --git a/Cura/alterations/end.gcode b/Cura/alterations/end.gcode
index 7131e56..4061667 100644
--- a/Cura/alterations/end.gcode
+++ b/Cura/alterations/end.gcode
@@ -4,5 +4,4 @@ G1 Z+10 E-5 F400       ;move Z up a bit and retract filament by 5mm
 G28 X0 Y0              ;move X/Y to min endstops, so the head is out of the way
 M84                    ;steppers off
 G90                    ;absolute positioning
-M107                   ;fan off
 
diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index 3be5a29..58b82ce 100644
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -295,7 +295,7 @@ def getProfileInformation():
 			'Name_of_Cool_Start_File': DEFSET,
 			'Orbital_Outset_millimeters': DEFSET,
 			'Turn_Fan_On_at_Beginning': storedSetting("fan_enabled"),
-			'Turn_Fan_Off_at_Ending': "False",
+			'Turn_Fan_Off_at_Ending': storedSetting("fan_enabled"),
 			'Minimum_feed_rate_mm/s': storedSettingFloat("cool_min_feedrate"),
 			'Fan_on_at_layer': storedSettingInt('fan_layer'),
 			'Fan_speed_%': storedSettingInt('fan_speed'),