diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 4c11db7819..a9e0b214ee 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -18022,7 +18022,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 ( 45524, 55095, 0, 'Chains of Ice - Frost Fever'),
 ( 20066,-61840, 0, 'Repentance'),
 ( 66235, 66233, 0, 'Ardent Defender Visuals'),
-( 58875, 58876, 0, 'Spirit Walk'),
+( 58875, 58876, 1, 'Spirit Walk'),
 -- Quest
 ( 40214, 40216, 2, 'Dragonmaw Illusion'),
 ( 40214, 42016, 2, 'Dragonmaw Illusion'),
diff --git a/sql/updates/2011_01_10_0_world_spell_linked_spell.sql b/sql/updates/2011_01_10_0_world_spell_linked_spell.sql
new file mode 100644
index 0000000000..aea063c750
--- /dev/null
+++ b/sql/updates/2011_01_10_0_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=58875 AND `spell_effect`=58876;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(58875,58876,1, 'Spirit Walk');
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index bb3a1276fa..66bb62e207 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -5076,17 +5076,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     triggered_spell_id = 34650;
                     break;
                 }
-                // Spirit Walk
-                case 58875:
-                {
-                    // Cast on owner
-                    target = GetOwner();
-                    if (!target)
-                        return false;
-
-                    triggered_spell_id = 58876;
-                    break;
-                }
                 // Mark of Malice
                 case 33493:
                 {