diff --git a/CMakeLists.txt b/CMakeLists.txt
index 007e179..2ebbad7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,7 @@ find_package(aap_protobuf REQUIRED)
 find_package(aasdk REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system log_setup log OPTIONAL_COMPONENTS unit_test_framework)
 find_package(libusb-1.0 REQUIRED)
-find_package(Qt5 COMPONENTS DBus Multimedia MultimediaWidgets Bluetooth Network)
+find_package(Qt5 REQUIRED COMPONENTS DBus Multimedia MultimediaWidgets Bluetooth Network WebSockets)
 find_package(OpenSSL REQUIRED)
 find_package(rtaudio REQUIRED)
 find_package(taglib REQUIRED)
@@ -130,6 +130,7 @@ target_include_directories(autoapp PUBLIC ${AAP_PROTOBUF_INCLUDE_DIR} ${AASDK_IN
 
 target_link_libraries(autoapp PUBLIC
         libusb
+        Qt5::WebSockets
         ${Boost_LIBRARIES}
         ${Qt5DBus_LIBRARIES}
         ${Qt5Multimedia_LIBRARIES}
@@ -174,4 +175,4 @@ set_target_properties(autoapp
 #install(TARGETS autoapp btservice
 #        EXPORT aasdkTargets
 #        RUNTIME DESTINATION bin
-#)
\ No newline at end of file
+#)
diff --git a/include/f1x/openauto/autoapp/UI/MainWindow.hpp b/include/f1x/openauto/autoapp/UI/MainWindow.hpp
index db12cde..c9ce72b 100644
--- a/include/f1x/openauto/autoapp/UI/MainWindow.hpp
+++ b/include/f1x/openauto/autoapp/UI/MainWindow.hpp
@@ -41,6 +41,7 @@
 #include <taglib/fileref.h>
 #include <taglib/tag.h>
 
+#include <QtWebSockets/QWebSocket>
 #include <QFileSystemWatcher>
 #include <QKeyEvent>
 
@@ -266,6 +267,7 @@ namespace f1x
                     QBluetoothLocalDevice *localDevice;
                     QWebSocket *webSocket;
                     QTimer *reconnectTimer;
+                    bool shuttingDown;
 
                 protected:
                     void keyPressEvent(QKeyEvent *event);
diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp
index 704a175..5dd7d0b 100644
--- a/src/autoapp/UI/MainWindow.cpp
+++ b/src/autoapp/UI/MainWindow.cpp
@@ -32,7 +32,7 @@
 #include <QVideoWidget>
 #include <QNetworkInterface>
 #include <QStandardItemModel>
-#include <QWebSocket>
+#include <QtWebSockets/QWebSocket>
 #include <iostream>
 #include <fstream>
 #include <cstdio>