diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h
index df26f6c23..94b86c608 100644
--- a/Firmware/Configuration_adv.h
+++ b/Firmware/Configuration_adv.h
@@ -346,9 +346,11 @@ const unsigned int dropsegments=5; //everything with less than this number of st
 // 2nd and 3rd byte (LSB first) contains a 16bit length of a command including its preceding comments.
 #define CMDHDRSIZE 3
 
-#define FILAMENT_CHANGE_UNLOAD_FEEDRATE     10  // (mm/s) Unload filament feedrate. This can be pretty fast.
-#define FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE       86.67f  // (mm/s) Unload fast retract feedrate.
-#define FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE       16.67f  // (mm/s) Unload slow retract feedrate.
+#define FILAMENT_CHANGE_UNLOAD_FEEDRATE         10.f  // (mm/s) Unload filament feedrate. This can be pretty fast.
+#define FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE   86.67f  // (mm/s) Unload fast retract feedrate.
+#define FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE   16.67f  // (mm/s) Unload slow retract feedrate.
+#define FILAMENT_UNLOAD_FAST_RETRACT_LENGTH     45.f  // (mm) Unload fast retract length.
+#define FILAMENT_UNLOAD_SLOW_RETRACT_LENGTH     35.f  // (mm) Unload slow retract length.
 
 // Firmware based and LCD controlled retract
 // M207 and M208 can be used to define parameters for the retraction.
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f24338b6b..4c0edabdf 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4859,11 +4859,11 @@ void unload_filament(float unloadLength)
 
     FSensorBlockRunout fsBlockRunout;
 
-    current_position[E_AXIS] -= 45;
+    current_position[E_AXIS] -= FILAMENT_UNLOAD_FAST_RETRACT_LENGTH;
     plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE);
     st_synchronize();
 
-    current_position[E_AXIS] -= 35;
+    current_position[E_AXIS] -= FILAMENT_UNLOAD_SLOW_RETRACT_LENGTH;
     plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE);
     st_synchronize();