diff --git a/FaserGeometryCommon/TrenchGeoModel/src/TrenchDetectorFactory.cxx b/FaserGeometryCommon/TrenchGeoModel/src/TrenchDetectorFactory.cxx
index 3862cc8c601539ad51b4b849ad7d21de4a26c82f..c2dcc9b2201c4441f0ec5fbe92fccb4177dd5d74 100644
--- a/FaserGeometryCommon/TrenchGeoModel/src/TrenchDetectorFactory.cxx
+++ b/FaserGeometryCommon/TrenchGeoModel/src/TrenchDetectorFactory.cxx
@@ -61,7 +61,12 @@ void TrenchDetectorFactory::create(GeoPhysVol *world)
 
     std::string resolvedFile = PathResolver::find_file(gdmlFile, "XMLPATH", PathResolver::RecursiveSearch);
 
-    XMLHandlerStore::GetHandlerStore()->clear();
+    auto store = XMLHandlerStore::GetHandlerStore();
+    for (auto p : *store)
+    {
+      delete p.second;
+    }
+    store->clear();
 
     GDMLController controller {"TrenchGDMLController"};