diff --git a/examples/DemoRunner/Source/Main.cpp b/examples/DemoRunner/Source/Main.cpp
index 322a785b4e..da2b401584 100644
--- a/examples/DemoRunner/Source/Main.cpp
+++ b/examples/DemoRunner/Source/Main.cpp
@@ -143,10 +143,6 @@ private:
 
             setContentOwned (new MainComponent(), false);
             setVisible (true);
-
-           #if JUCE_MAC || JUCE_WINDOWS || JUCE_LINUX || JUCE_BSD
-            taskbarIcon.reset (new DemoTaskbarComponent());
-           #endif
         }
 
         void closeButtonPressed() override    { JUCEApplication::getInstance()->systemRequestedQuit(); }
@@ -163,7 +159,20 @@ private:
         MainComponent& getMainComponent()    { return *dynamic_cast<MainComponent*> (getContentComponent()); }
 
     private:
-        std::unique_ptr<Component> taskbarIcon;
+       #if JUCE_MAC || JUCE_WINDOWS || JUCE_LINUX || JUCE_BSD
+        std::unique_ptr<Component> taskbarIcon = std::invoke ([&]() -> std::unique_ptr<Component>
+        {
+            // This is a workaround for a bug in the Ubuntu desktop session on Wayland, which
+            // crashes when adding an X11 system tray entry.
+            const auto sessionType = SystemStats::getEnvironmentVariable ("XDG_SESSION_TYPE", {});
+            const auto sessionName = SystemStats::getEnvironmentVariable ("XDG_SESSION_DESKTOP", {});
+
+            if (sessionName.equalsIgnoreCase ("ubuntu") && sessionType.equalsIgnoreCase ("wayland"))
+                return {};
+
+            return std::make_unique<DemoTaskbarComponent>();
+        });
+       #endif
 
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainAppWindow)
     };