diff --git a/data/sql/updates/pending_db_world/rev_1730310110375137038.sql b/data/sql/updates/pending_db_world/rev_1730310110375137038.sql
new file mode 100644
index 000000000..8ba927292
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1730310110375137038.sql
@@ -0,0 +1,3 @@
+--
+-- Headless Horseman: NO_MOVE_FLAGS_UPDATE - Creature won't update movement flags
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 512 WHERE (`entry` = 23682);
diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp
index f0905929f..15e10a2e2 100644
--- a/src/server/scripts/Events/hallows_end.cpp
+++ b/src/server/scripts/Events/hallows_end.cpp
@@ -1091,6 +1091,8 @@ struct boss_headless_horseman : public ScriptedAI
                 me->ReplaceAllUnitFlags(UNIT_FLAG_NONE);
                 me->StopMoving();
 
+                me->SetDisableGravity(false);
+
                 me->SetInCombatWithZone();
                 inFight = true;
                 events.ScheduleEvent(EVENT_HORSEMAN_FOLLOW, 500ms);
@@ -1187,6 +1189,7 @@ struct boss_headless_horseman : public ScriptedAI
                                 trigger->CastSpell(trigger, SPELL_EARTH_EXPLOSION, true);
                             break;
                         case 3:
+                            me->SetDisableGravity(true);
                             me->GetMotionMaster()->MovePath(236820, false);
                             me->CastSpell(me, SPELL_SHAKE_CAMERA_SMALL, true);
                             player->Say(TALK_PLAYER_FELT_DEATH);