diff --git a/distrho/src/DistrhoPluginVST2.cpp b/distrho/src/DistrhoPluginVST2.cpp
index 6b67c8a3..e8af1507 100644
--- a/distrho/src/DistrhoPluginVST2.cpp
+++ b/distrho/src/DistrhoPluginVST2.cpp
@@ -202,11 +202,6 @@ public:
 # endif
     }
 
-    ~UIVst()
-    {
-        fUI.quit();
-    }
-
     // -------------------------------------------------------------------
 
     void idle()
diff --git a/distrho/src/DistrhoUIInternal.hpp b/distrho/src/DistrhoUIInternal.hpp
index aa7b1b5e..e1d143af 100644
--- a/distrho/src/DistrhoUIInternal.hpp
+++ b/distrho/src/DistrhoUIInternal.hpp
@@ -107,6 +107,7 @@ public:
 
     ~UIExporter()
     {
+        quit();
         delete ui;
         delete uiData;
     }