diff --git a/src/Mod/TechDraw/App/CosmeticExtension.cpp b/src/Mod/TechDraw/App/CosmeticExtension.cpp
index cd42e7a17b..0d9c9ec446 100644
--- a/src/Mod/TechDraw/App/CosmeticExtension.cpp
+++ b/src/Mod/TechDraw/App/CosmeticExtension.cpp
@@ -594,12 +594,8 @@ void CosmeticExtension::removeCenterLine(const std::vector<std::string>& delTags
 
 void CosmeticExtension::clearGeomFormats()
 {
-    std::vector<GeomFormat*> noFormats;
-    std::vector<GeomFormat*> fmts = GeomFormats.getValues();
-    GeomFormats.setValues(noFormats);
-    for (auto& f : fmts) {
-        delete f;
-    }
+  // setValues takes care of deletion of old entries as well
+    GeomFormats.setValues({});
 }
 
 //returns unique GF id