diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index 9932055a9..1fe6ada4e 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -311,7 +311,9 @@ void runGui(QApplication &a, Paths &paths, Settings &settings)
         pajlada::Settings::SettingManager::gSave();
     }
 
-    thread.join();
+    if (thread.joinable()) {
+        thread.join();
+    }
     chatterino::NetworkManager::deinit();
 
 #ifdef USEWINSDK