diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp
index e4d8e96611..44a4794541 100644
--- a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp
+++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp
@@ -63,7 +63,9 @@ public:
         if (isActive)
         {
             isActive = false;
-            ModalComponentManager::getInstance()->triggerAsyncUpdate();
+
+            if (ModalComponentManager* mcm = ModalComponentManager::getInstanceWithoutCreating())
+                mcm->triggerAsyncUpdate();
         }
     }
 
@@ -83,6 +85,7 @@ ModalComponentManager::ModalComponentManager()
 
 ModalComponentManager::~ModalComponentManager()
 {
+    stack.clear();
     clearSingletonInstance();
 }