diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index dd5eb4d..a0b1d0a 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -517,7 +517,10 @@ void Creature::DoSkill(int skill_id,
             std::set<Creature*> target_list;
             SelectSkillTargets(CurrentSkill(), GetPos(), target_list);
             TriggerBuff(CurrentSkill(), target_list, kBTT_UseSkill);
-            UpdateSkill();
+            if (!CurrentSkill()->meta->phases.empty() &&
+                CurrentSkill()->meta->phases[0].time_offset <= 0) {
+                UpdateSkill();
+            }
         } else {
             Entity* entity = room->GetEntityByUniId(skill_target_id_);
             if (entity && entity->IsEntityType(ET_Player)) {