diff --git a/src/crits.cpp b/src/crits.cpp
index 1bdb2f95..3d744148 100755
--- a/src/crits.cpp
+++ b/src/crits.cpp
@@ -95,7 +95,7 @@ static const model_t *lastweapon = nullptr;
 bool force_crit(IClientEntity *weapon)
 {
     if (lastnumber < g_pUserCmd->command_number ||
-        lastweapon != weapon->GetModel())
+        lastweapon != weapon->GetModel() || lastnumber - g_pUserCmd > 1000)
     {
         if (cached_calculation.init_command > g_pUserCmd->command_number ||
             g_pUserCmd->command_number - cached_calculation.init_command >
diff --git a/src/hooks/others.cpp b/src/hooks/others.cpp
index 79ddc298..645d4a53 100644
--- a/src/hooks/others.cpp
+++ b/src/hooks/others.cpp
@@ -416,7 +416,7 @@ void Shutdown_hook(void *_this, const char *reason)
     }
 
     if (hacks::shared::autojoin::auto_queue)
-        tfmm::abandon();
+        tfmm::queue_start();
 }
 
 static CatVar resolver(CV_SWITCH, "resolver", "0", "Resolve angles");