diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 419dfd8df8..ac1b02de45 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -26417,6 +26417,7 @@ AudioPluginFormatManager::AudioPluginFormatManager() throw()
 
 AudioPluginFormatManager::~AudioPluginFormatManager() throw()
 {
+    clearSingletonInstance();
 }
 
 juce_ImplementSingleton_SingleThreaded (AudioPluginFormatManager);
diff --git a/src/juce_appframework/audio/plugins/juce_AudioPluginFormatManager.cpp b/src/juce_appframework/audio/plugins/juce_AudioPluginFormatManager.cpp
index d99be65473..77d4f31bfb 100644
--- a/src/juce_appframework/audio/plugins/juce_AudioPluginFormatManager.cpp
+++ b/src/juce_appframework/audio/plugins/juce_AudioPluginFormatManager.cpp
@@ -50,6 +50,7 @@ AudioPluginFormatManager::AudioPluginFormatManager() throw()
 
 AudioPluginFormatManager::~AudioPluginFormatManager() throw()
 {
+    clearSingletonInstance();
 }
 
 juce_ImplementSingleton_SingleThreaded (AudioPluginFormatManager);