diff --git a/data/sql/updates/pending_db_world/fix_flexweave_underlay_script.sql b/data/sql/updates/pending_db_world/fix_flexweave_underlay_script.sql
new file mode 100644
index 000000000..53c0a1d7f
--- /dev/null
+++ b/data/sql/updates/pending_db_world/fix_flexweave_underlay_script.sql
@@ -0,0 +1,3 @@
+-- Move Flexweave Underlay script from enchant application spell (55002) to parachute use-spell (55001)
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (55001, 55002) AND `ScriptName` = 'spell_item_flexweave_underlay';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (55001, 'spell_item_flexweave_underlay');
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index 764af2b9a..dc9340479 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -3564,7 +3564,7 @@ class spell_item_rocket_boots : public SpellScript
     }
 };
 
-// 55002 - Flexweave Underlay
+// 55001 - Flexweave Underlay (Parachute)
 class spell_item_flexweave_underlay : public SpellScript
 {
     PrepareSpellScript(spell_item_flexweave_underlay);
@@ -3573,7 +3573,7 @@ class spell_item_flexweave_underlay : public SpellScript
     {
         if (GetCaster()->IsFlying() || GetCaster()->IsFalling())
             return SPELL_CAST_OK;
-        return SPELL_FAILED_NOT_FLYING;
+        return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW;
     }
 
     void Register() override