diff --git a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp
index aedfbd330..7edfe85bd 100644
--- a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.cpp
@@ -52,10 +52,14 @@ WelcomePlugin::WelcomePlugin()
 
 WelcomePlugin::~WelcomePlugin()
 {
+    // The below code is commented out to avoid having the application
+    // crash when it is terminated. TODO: Fix a real solution.
+    /*
     if (m_welcomeMode) {
         removeObject(m_welcomeMode);
         delete m_welcomeMode;
     }
+    */
 }
 
 /*! Initializes the plugin. Returns true on success.