diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index de522bc6..68e9cc01 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -211,6 +211,7 @@ Creature::Creature():MoveableEntity()
 
 Creature::~Creature()
 {
+    ClearBuffList();
     for (auto& pair : skill_hash_) {
         delete pair.second;
     }