diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index a3d4ca7b4f..9f6181f713 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -4530,28 +4530,35 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
 
     if (m_config.enable_overhang_speed && !m_config.overhang_speed_classic && !this->on_first_layer() &&
         (is_bridge(path.role()) || is_perimeter(path.role()))) {
-        ConfigOptionPercents overhang_overlap_levels({75, 50, 25, 13,12.99,0});
+        double out_wall_ref_speed = m_config.get_abs_value("outer_wall_speed");
+        ConfigOptionPercents         overhang_overlap_levels({75, 50, 25, 13, 12.99, 0});
         ConfigOptionFloatsOrPercents dynamic_overhang_speeds(
-            {(m_config.get_abs_value("overhang_1_4_speed") < 0.5)
-                 ? FloatOrPercent{100, true}
-                 : FloatOrPercent{m_config.get_abs_value("overhang_1_4_speed"), false},
-             (m_config.get_abs_value("overhang_2_4_speed") < 0.5)
-                 ? FloatOrPercent{100, true}
-                 : FloatOrPercent{m_config.get_abs_value("overhang_2_4_speed"), false},
-             (m_config.get_abs_value("overhang_3_4_speed") < 0.5)
-                 ? FloatOrPercent{100, true}
-                 : FloatOrPercent{m_config.get_abs_value("overhang_3_4_speed"), false},
-             (m_config.get_abs_value("overhang_4_4_speed") < 0.5)
-                 ? FloatOrPercent{100, true}
-                 : FloatOrPercent{m_config.get_abs_value("overhang_4_4_speed"), false},
-             FloatOrPercent{m_config.get_abs_value("bridge_speed"), false},
-             FloatOrPercent{m_config.get_abs_value("bridge_speed"), false}});
+            {(m_config.get_abs_value("overhang_1_4_speed") < 0.5) ?
+                 FloatOrPercent{100, true} :
+                 FloatOrPercent{m_config.get_abs_value("overhang_1_4_speed") * 100 / out_wall_ref_speed, true},
+             (m_config.get_abs_value("overhang_2_4_speed") < 0.5) ?
+                 FloatOrPercent{100, true} :
+                 FloatOrPercent{m_config.get_abs_value("overhang_2_4_speed") * 100 / out_wall_ref_speed, true},
+             (m_config.get_abs_value("overhang_3_4_speed") < 0.5) ?
+                 FloatOrPercent{100, true} :
+                 FloatOrPercent{m_config.get_abs_value("overhang_3_4_speed") * 100 / out_wall_ref_speed, true},
+             (m_config.get_abs_value("overhang_4_4_speed") < 0.5) ?
+                 FloatOrPercent{100, true} :
+                 FloatOrPercent{m_config.get_abs_value("overhang_4_4_speed") * 100 / out_wall_ref_speed, true},
+             FloatOrPercent{m_config.get_abs_value("bridge_speed") * 100 / out_wall_ref_speed, true},
+             FloatOrPercent{m_config.get_abs_value("bridge_speed") * 100 / out_wall_ref_speed, true}});
 
-        new_points = m_extrusion_quality_estimator.estimate_extrusion_quality(
-            path, overhang_overlap_levels, dynamic_overhang_speeds, m_config.get_abs_value("outer_wall_speed"), speed);
+        if (out_wall_ref_speed == 0)
+            out_wall_ref_speed = EXTRUDER_CONFIG(filament_max_volumetric_speed) / _mm3_per_mm;
 
-        variable_speed = std::any_of(new_points.begin(), new_points.end(),
-                                     [speed](const ProcessedPoint &p) { return p.speed != speed; });
+        if (EXTRUDER_CONFIG(filament_max_volumetric_speed) > 0) {
+            out_wall_ref_speed = std::min(out_wall_ref_speed, EXTRUDER_CONFIG(filament_max_volumetric_speed) / path.mm3_per_mm);
+        }
+
+        new_points = m_extrusion_quality_estimator.estimate_extrusion_quality(path, overhang_overlap_levels, dynamic_overhang_speeds,
+                                                                              out_wall_ref_speed, speed);
+
+        variable_speed = std::any_of(new_points.begin(), new_points.end(), [speed](const ProcessedPoint &p) { return p.speed != speed; });
     }
 
     double F = speed * 60;  // convert mm/sec to mm/min