diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index e55e24a7ad..ab06a64554 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -161,7 +161,12 @@ sub thread_cleanup {
     *Slic3r::Print::SupportMaterial2::DESTROY = sub {};
     *Slic3r::TriangleMesh::DESTROY          = sub {};
     *Slic3r::GUI::AppConfig::DESTROY        = sub {};
+    *Slic3r::GUI::GCodePreviewData::DESTROY = sub {};
+    *Slic3r::GUI::OctoPrint::DESTROY        = sub {};
     *Slic3r::GUI::PresetBundle::DESTROY     = sub {};
+    *Slic3r::GUI::PresetHints::DESTROY      = sub {};
+    *Slic3r::GUI::PresetUpdater::DESTROY    = sub {};
+    *Slic3r::GUI::TabIface::DESTROY         = sub {};
     return undef;  # this prevents a "Scalars leaked" warning
 }