diff --git a/data/menu/nullifiedcat/misc/catbot.xml b/data/menu/nullifiedcat/misc/catbot.xml
index 6b614bce..af4cfb38 100755
--- a/data/menu/nullifiedcat/misc/catbot.xml
+++ b/data/menu/nullifiedcat/misc/catbot.xml
@@ -7,6 +7,7 @@
             <AutoVariable width="fill" target="hack.requeue-on-kick" label="Requeue on kick"/>
             <AutoVariable width="fill" target="autotaunt.enable" label="Autotaunt enabled"/>
             <AutoVariable width="fill" target="autotaunt.chance" label="Autotaunt chance" min="0" max="100"/>
+            <AutoVariable width="fill" target="autotaunt.safety-distance" label="Autotaunt safety distance"/>
             <LabeledObject width="fill" label="Autojoin Class">
                 <Select target="autojoin.class">
                     <Option name="None" value="0"/>
diff --git a/src/hacks/AutoTaunt.cpp b/src/hacks/AutoTaunt.cpp
index ac2d6392..80222efb 100644
--- a/src/hacks/AutoTaunt.cpp
+++ b/src/hacks/AutoTaunt.cpp
@@ -11,6 +11,7 @@
 
 static settings::Bool enable{ "autotaunt.enable", "false" };
 static settings::Float chance{ "autotaunt.chance", "8" };
+static settings::Float safety{ "autotaunt.safety-distance", "0" };
 
 namespace hacks::tf::autotaunt
 {
@@ -26,7 +27,17 @@ public:
         }
         if (g_IEngine->GetPlayerForUserID(event->GetInt("attacker")) == g_IEngine->GetLocalPlayer())
         {
-            if (RandomFloat(0, 100) <= float(chance))
+            bool nearby = false;
+            for (int i = 1; i < g_IEngine->GetMaxClients(); i++)
+            {
+                auto ent = ENTITY(i);
+                if (CE_GOOD(ent) && ent->m_flDistance() < *safety)
+                {
+                    nearby = true;
+                    break;
+                }
+            }
+            if (!nearby && RandomFloat(0, 100) <= float(chance))
             {
                 hack::ExecuteCommand("taunt");
             }
@@ -36,6 +47,8 @@ public:
 
 AutoTauntListener listener;
 
-// TODO remove event listener when uninjecting?
-InitRoutine init([]() { g_IEventManager2->AddListener(&listener, "player_death", false); });
+InitRoutine init([]() {
+    g_IEventManager2->AddListener(&listener, "player_death", false);
+    EC::Register(EC::Shutdown, []() { g_IEventManager2->RemoveListener(&listener); }, "Shutdown_Autotaunt");
+});
 } // namespace hacks::tf::autotaunt