diff --git a/examples/DemoRunner/Source/Demos/JUCEDemos.cpp b/examples/DemoRunner/Source/Demos/JUCEDemos.cpp
index ccc7fd88b0..29b7a4cf7a 100644
--- a/examples/DemoRunner/Source/Demos/JUCEDemos.cpp
+++ b/examples/DemoRunner/Source/Demos/JUCEDemos.cpp
@@ -85,8 +85,6 @@ File JUCEDemos::findExamplesDirectoryFromExecutable (File exec)
 }
 
 //==============================================================================
-std::unique_ptr<AudioDeviceManager> sharedAudioDeviceManager;
-
 static String getCurrentDefaultAudioDeviceName (AudioDeviceManager& deviceManager, bool isInput)
 {
     auto* deviceType = deviceManager.getCurrentDeviceTypeObject();
diff --git a/examples/DemoRunner/Source/Main.cpp b/examples/DemoRunner/Source/Main.cpp
index ad770d7e00..4d8a120e2b 100644
--- a/examples/DemoRunner/Source/Main.cpp
+++ b/examples/DemoRunner/Source/Main.cpp
@@ -73,6 +73,8 @@
  };
 #endif
 
+std::unique_ptr<AudioDeviceManager> sharedAudioDeviceManager;
+
 //==============================================================================
 class DemoRunnerApplication  : public JUCEApplication
 {
@@ -80,6 +82,11 @@ public:
     //==============================================================================
     DemoRunnerApplication() {}
 
+    ~DemoRunnerApplication()
+    {
+        sharedAudioDeviceManager.reset();
+    }
+
     const String getApplicationName() override       { return ProjectInfo::projectName; }
     const String getApplicationVersion() override    { return ProjectInfo::versionString; }
     bool moreThanOneInstanceAllowed() override       { return true; }
diff --git a/examples/DemoRunner/Source/UI/MainComponent.cpp b/examples/DemoRunner/Source/UI/MainComponent.cpp
index a87daa9c13..32244a2e00 100644
--- a/examples/DemoRunner/Source/UI/MainComponent.cpp
+++ b/examples/DemoRunner/Source/UI/MainComponent.cpp
@@ -306,7 +306,6 @@ MainComponent::MainComponent()
 MainComponent::~MainComponent()
 {
     contentComponent->clearCurrentDemo();
-    sharedAudioDeviceManager.reset();
 }
 
 //==============================================================================