diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index e70874c93f27d6e25a4195d3a9114963625d3a61..1b2b87ddb2cca903f898404b3a57d7b1c20feb2b 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -448,6 +448,9 @@ void QGCApplication::setLanguage()
 
 void QGCApplication::_shutdown()
 {
+    // Close out all Qml before we delete toolbox. This way we don't get all sorts of null reference complaints from Qml.
+    delete _qmlAppEngine;
+
     shutdownVideoStreaming();
     delete _toolbox;
 }