diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp
index bf62dbaec..8d8d6b9f3 100644
--- a/src/server/game/Spells/SpellInfoCorrections.cpp
+++ b/src/server/game/Spells/SpellInfoCorrections.cpp
@@ -4391,6 +4391,12 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->SpellFamilyName = SPELLFAMILY_POTION;
     });
 
+    // Refocus (Renataki's charm of beasts)
+    ApplySpellFix({ 24531 }, [](SpellInfo* spellInfo)
+    {
+        spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_CASTER);
+    });
+
     // Collect Rookery Egg
     ApplySpellFix({ 15958 }, [](SpellInfo* spellInfo)
     {
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index 2dc0731cc..d3957d00a 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -3403,9 +3403,7 @@ class spell_item_chicken_cover : public SpellScript
 
 enum Refocus
 {
-    SPELL_AIMED_SHOT    = 19434,
-    SPELL_MULTISHOT     = 2643,
-    SPELL_VOLLEY        = 42243,
+    SPELL_CATEGORY_AIMED_MULTI = 85
 };
 
 class spell_item_refocus : public SpellScript
@@ -3419,9 +3417,7 @@ class spell_item_refocus : public SpellScript
         if (!caster || caster->getClass() != CLASS_HUNTER)
             return;
 
-        caster->RemoveSpellCooldown(SPELL_AIMED_SHOT, true);
-        caster->RemoveSpellCooldown(SPELL_MULTISHOT, true);
-        caster->RemoveSpellCooldown(SPELL_VOLLEY, true);
+        caster->RemoveCategoryCooldown(SPELL_CATEGORY_AIMED_MULTI);
     }
 
     void Register() override