diff --git a/source/interface.cpp b/source/interface.cpp
index ae5786e..308e6e9 100644
--- a/source/interface.cpp
+++ b/source/interface.cpp
@@ -1127,7 +1127,10 @@ void ClientDisconnect (edict_t *ent)
 
    // check if its a bot
    if (bot != nullptr && bot->pev == &ent->v)
+   {
+      bot->EnableChatterIcon (false);
       bots.Free (index);
+   }
 
    bots.AdjustQuota (false, ent);
 
diff --git a/source/manager.cpp b/source/manager.cpp
index 3d5a867..a8be448 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -1040,9 +1040,7 @@ Bot::~Bot (void)
 {
    // this is bot destructor
 
-   EnableChatterIcon (false);
    ReleaseUsedName ();
-
    DeleteSearchNodes ();
    ResetTasks ();
 }