diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index a0a96511..4c5d14b0 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -944,7 +944,7 @@ void Creature::DoSkill(int skill_id,
         }
 #endif
         target_valid_pos_activated = false;
-        RemoveBuffByEffectId(kBET_Hide);
+        RemoveHideEffect(kUseSkillReason);
         if (!nature_recover_hp_idle_timer.expired()) {
             room->xtimer.FireEvent
                 (
@@ -2460,7 +2460,7 @@ void Creature::UpdateMove()
     {
         Buff* hide_buff = GetBuffByEffectId(kBET_Hide);
         if (hide_buff && hide_buff->meta->_int_buff_param1 > 0) {
-            RemoveBuffByEffectId(kBET_Hide);
+            RemoveHideEffect(kMoveReason);
         }
     }
 
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index b5f9f963..df392ca5 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2304,7 +2304,7 @@ void Human::OnBulletHit(IBullet* bullet)
     }
 
     RemoveBuffByEffectId(kBET_PeaceMode);
-    RemoveBuffByEffectId(kBET_Hide);
+    RemoveHideEffect(kOnBulletHitReason);
     if (!nature_recover_hp_idle_timer.expired()) {
         room->xtimer.FireEvent
             (
@@ -2460,7 +2460,7 @@ void Human::OnExplosionHit(Explosion* e)
     }
 
     RemoveBuffByEffectId(kBET_PeaceMode);
-    RemoveBuffByEffectId(kBET_Hide);
+    RemoveHideEffect(kOnExplosionHitReason);
     if (!nature_recover_hp_idle_timer.expired()) {
         room->xtimer.FireEvent
             (
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 88cbb4e1..622cdf92 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -1707,7 +1707,7 @@ void Player::UpdateThrowBomb()
                 weapon.meta &&
                 weapon.ammo > 0) {
                 if (HasBuffEffect(kBET_Hide)) {
-                    RemoveBuffByEffectId(kBET_Hide);
+                    RemoveHideEffect(kShotReason);
                 }
                 if (!nature_recover_hp_idle_timer.expired()) {
                     room->xtimer.FireEvent