diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 9e23dc01..cabc6767 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -979,12 +979,13 @@ void Creature::DoSkill(int skill_id,
     Skill* skill = GetSkill(skill_id);
     if (skill && CanUseSkill(skill_id)) {
         #if 1
-        {
+        if (IsPlayer()) {
             App::Instance()->verify_set_pos = 1;
             Position pos;
             pos.FromGlmVec3(*GetClientCurrPos());
             SetPos(pos);
             App::Instance()->verify_set_pos = 0;
+            room->grid_service->MoveCreature(this);
         }
         #endif
 #ifdef MYDEBUG