diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index f17b76738..81ecd1822 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -60,9 +60,9 @@ AmneziaApplication::~AmneziaApplication()
 
     m_vpnConnectionThread.quit();
 
-    if (!m_vpnConnectionThread.wait(5000)) {
+    if (!m_vpnConnectionThread.wait(4000)) {
         m_vpnConnectionThread.terminate();
-        m_vpnConnectionThread.wait();
+        m_vpnConnectionThread.wait(1000);
     }
 
     if (m_engine) {
diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp
index 8c74ea7f6..875a32387 100644
--- a/client/ui/controllers/pageController.cpp
+++ b/client/ui/controllers/pageController.cpp
@@ -141,9 +141,8 @@ void PageController::closeApplication()
         w->close();
     }
     QTimer::singleShot(0, qApp, []() { qApp->exit(0); });
-#else
-    qApp->quit();
 #endif
+    qApp->quit();
 }
 
 void PageController::setDrawerDepth(const int depth)
diff --git a/client/ui/systemtray_notificationhandler.cpp b/client/ui/systemtray_notificationhandler.cpp
index 995c43ca0..f56fab6ea 100644
--- a/client/ui/systemtray_notificationhandler.cpp
+++ b/client/ui/systemtray_notificationhandler.cpp
@@ -50,11 +50,8 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
                 for (auto w : qApp->topLevelWidgets()) {
                     w->close();
                 }
-
-                QTimer::singleShot(0, qApp, []() { qApp->exit(0); });
-#else
-        qApp->quit();
 #endif
+        qApp->quit();
         });
 
     m_systemTrayIcon.setContextMenu(&m_menu);