diff --git a/server/gameserver/hero.cc b/server/gameserver/hero.cc
index b4366742..c4c0e342 100644
--- a/server/gameserver/hero.cc
+++ b/server/gameserver/hero.cc
@@ -221,6 +221,9 @@ void Hero::DetachFromMaster()
         }
         detached_ = true;
     }
+    if (list_empty(&entry)) {
+        list_del_init(&entry);
+    }
 }
 
 void Hero::DecHP(float dec_hp, int killer_id, const std::string killer_name, int weapon_id,