diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py
index ea5b8e31c8..9b8c40a41c 100644
--- a/src/Mod/Path/PathScripts/PathOp.py
+++ b/src/Mod/Path/PathScripts/PathOp.py
@@ -361,6 +361,8 @@ class ObjectOp(object):
         if FeatureDiameters & features:
             obj.MinDiameter = '0 mm'
             obj.MaxDiameter = '0 mm'
+            if job.Stock:
+                obj.MaxDiameter = job.Stock.Shape.BoundBox.XLength
 
         if FeatureStartPoint & features:
             obj.UseStartPoint = False