diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py
index c7c3ee52..4cca8075 100644
--- a/appObjects/FlatCAMGeometry.py
+++ b/appObjects/FlatCAMGeometry.py
@@ -2278,6 +2278,8 @@ class GeometryObject(FlatCAMObj, Geometry):
                 dia_cnc_dict.update({
                     'tooldia': tooldia_val
                 })
+                if "optimization_type" not in tools_dict[tooluid_key]['data']:
+                    tools_dict[tooluid_key]['data']["optimization_type"] = self.app.defaults["geometry_optimization_type"]
 
                 # find the tool_dia associated with the tooluid_key
                 # search in the self.tools for the sel_tool_dia and when found see what tooluid has