diff --git a/sql/mangos_spell_check.sql b/sql/mangos_spell_check.sql
index 3bcb54084..1dae67688 100644
--- a/sql/mangos_spell_check.sql
+++ b/sql/mangos_spell_check.sql
@@ -345,7 +345,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas
 /*id   fm familyMaskA        fmMaskB    icon vis  cat  eff aur ef name                                  code                   */
 (    0, 3,0x0000000020000000,0x00000000,  -1,  -1,  -1,  2, -1,-1,'Arcane Blast',                       'Spell::EffectSchoolDMG'),
 (    0, 9,0x0000000000000800,0x00000000,  -1,  -1,  -1,  2, -1,-1,'Arcane Shot',                        'Spell::EffectSchoolDMG'),
-(    0, 5,0x0000000000004000,0x00000000,  -1,  -1,  -1, -1, -1,-1,'Drain Soul',                         'Aura::HandlePeriodicDamage'),
+(    0, 5,0x0000000000004000,0x00000000,  -1,  -1,  -1, -1, -1,-1,'Drain Soul',                         'Unit::SpellDamageBonus'),
 (    0,10,0x0000000000004000,0x00000000,  -1,  -1,  -1,  2, -1,-1,'Avenger\'s Shield',                  'Spell::EffectSchoolDMG'),
 (    0, 4,0x0000040000000000,0x00000000,  -1,  -1,  -1,  2, -1,-1,'Bloodthirst',                        'Spell::EffectSchoolDMG'),
 (0,     4,0x0000000000000001,0x00000000,  -1, 867,  -1,  3, -1,-1,'Charge',                             'Spell::EffectDummy'),
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 75a166efb..afed0ac18 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -4509,17 +4509,6 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
                 }
                 break;
             }
-            case SPELLFAMILY_WARLOCK:
-            {
-                // Drain Soul
-                if (m_spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000))
-                {
-                    if (m_target->GetHealth() * 100 / m_target->GetMaxHealth() <= 25)
-                       m_modifier.m_amount *= 4;
-                    return;
-                }
-                break;
-            }
             case SPELLFAMILY_DRUID:
             {
                 // Rake
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index a1e47da82..836bc79eb 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8348,6 +8348,16 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             }
             break;
         }
+        case SPELLFAMILY_WARLOCK:
+        {
+            // Drain Soul
+            if (spellProto->SpellFamilyFlags & UI64LIT(0x0000000000004000))
+            {
+                if (pVictim->GetHealth() * 100 / pVictim->GetMaxHealth() <= 25)
+                  DoneTotalMod *= 4;
+            }
+            break;
+        }
         case SPELLFAMILY_DEATHKNIGHT:
         {
             // Icy Touch, Howling Blast and Frost Strike
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index e407a9a9b..2e6723539 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8711"
+ #define REVISION_NR "8712"
 #endif // __REVISION_NR_H__