diff --git a/modules/juce_gui_basics/components/juce_Component.cpp b/modules/juce_gui_basics/components/juce_Component.cpp
index faaaa828f3..59bfaf7eae 100644
--- a/modules/juce_gui_basics/components/juce_Component.cpp
+++ b/modules/juce_gui_basics/components/juce_Component.cpp
@@ -1443,12 +1443,18 @@ bool Component::isCurrentlyBlockedByAnotherModalComponent() const
 
 int JUCE_CALLTYPE Component::getNumCurrentlyModalComponents() noexcept
 {
-    return ModalComponentManager::getInstance()->getNumModalComponents();
+    if (auto* manager = ModalComponentManager::getInstanceWithoutCreating())
+        return manager->getNumModalComponents();
+
+    return {};
 }
 
 Component* JUCE_CALLTYPE Component::getCurrentlyModalComponent (int index) noexcept
 {
-    return ModalComponentManager::getInstance()->getModalComponent (index);
+    if (auto* manager = ModalComponentManager::getInstanceWithoutCreating())
+        return manager->getModalComponent (index);
+
+    return {};
 }
 
 //==============================================================================