diff --git a/src/game/World/World.cpp b/src/game/World/World.cpp
index d59eefb1ea..5537676108 100644
--- a/src/game/World/World.cpp
+++ b/src/game/World/World.cpp
@@ -161,8 +161,10 @@ World::~World()
     VMAP::VMapFactory::clear();
     MMAP::MMapFactory::clear();
 
-    m_lfgQueueThread.join();
-    m_bgQueueThread.join();
+    if (m_lfgQueueThread.joinable())
+        m_lfgQueueThread.join();
+    if (m_bgQueueThread.joinable())
+        m_bgQueueThread.join();
 }
 
 /// Cleanups before world stop