diff --git a/modules/juce_core/containers/juce_ListenerList.h b/modules/juce_core/containers/juce_ListenerList.h
index 4856f321b06..3b4b24956c6 100644
--- a/modules/juce_core/containers/juce_ListenerList.h
+++ b/modules/juce_core/containers/juce_ListenerList.h
@@ -230,7 +230,10 @@ class ListenerList
                                Callback&& callback)
     {
        #if JUCE_ASSERTIONS_ENABLED_OR_LOGGED
-        const ScopedTryLock callCheckedExcludingLock (*callCheckedExcludingMutex);
+        // Keep a reference to the mutex to protect against the case where this list gets deleted
+        // during a callback.
+        auto localMutexPtr = callCheckedExcludingMutex;
+        const ScopedTryLock callCheckedExcludingLock (*localMutexPtr);
 
         // If you hit this assertion it means you're trying to call the listeners from multiple
         // threads concurrently. If you need to do this either use a LightweightListenerList, for a
@@ -396,9 +399,9 @@ class ListenerList
     }
 
    #if JUCE_ASSERTIONS_ENABLED_OR_LOGGED
-    // using a unique_ptr helps keep the size of this class down to prevent excessive stack sizes
+    // using a shared_ptr helps keep the size of this class down to prevent excessive stack sizes
     // due to objects that contain a ListenerList being created on the stack
-    std::unique_ptr<CriticalSection> callCheckedExcludingMutex = std::make_unique<CriticalSection>();
+    std::shared_ptr<CriticalSection> callCheckedExcludingMutex = std::make_shared<CriticalSection>();
    #endif
 
     //==============================================================================