diff --git a/extras/Demo/Source/MainWindow.cpp b/extras/Demo/Source/MainWindow.cpp
index b2950419c0..9c1eaf9bd1 100644
--- a/extras/Demo/Source/MainWindow.cpp
+++ b/extras/Demo/Source/MainWindow.cpp
@@ -117,6 +117,11 @@ public:
         demoList.selectRow (0);
     }
 
+    void clearCurrentDemo()
+    {
+        currentDemo = nullptr;
+    }
+
     void resized() override
     {
         Rectangle<int> r (getLocalBounds());
@@ -509,6 +514,7 @@ MainAppWindow::MainAppWindow()
 
 MainAppWindow::~MainAppWindow()
 {
+    contentComponent->clearCurrentDemo();
     clearContentComponent();
     contentComponent = nullptr;
     applicationCommandManager = nullptr;