diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp
index 26d9e897..44beee4b 100644
--- a/src/hacks/AutoJoin.cpp
+++ b/src/hacks/AutoJoin.cpp
@@ -59,7 +59,7 @@ void UpdateSearch()
     if (autoqueue_timer.test_and_set(30000))
     {
         re::CTFGCClientSystem *gc = re::CTFGCClientSystem::GTFGCClientSystem();
-        if (gc && !gc->BConnectedToMatchServer(false) && CE_BAD(LOCAL_E))
+        if (gc && !gc->BConnectedToMatchServer(false) && !g_pUserCmd)
         {
             logging::Info("Starting queue");
             tfmm::queue_start();