diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 0e715bf55..759141d94 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -666,10 +666,13 @@ class spell_hun_readiness : public SpellScript
             && spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER
             && spellInfo->Id != SPELL_HUNTER_READINESS
             && spellInfo->Id != SPELL_HUNTER_BESTIAL_WRATH
-            && spellInfo->Id != SPELL_DRAENEI_GIFT_OF_THE_NAARU
-            && spellInfo->GetRecoveryTime() > 0)
+            && spellInfo->Id != SPELL_DRAENEI_GIFT_OF_THE_NAARU)
             {
-                caster->RemoveSpellCooldown(spellInfo->Id, itr->second.needSendToClient);
+                if (spellInfo->RecoveryTime > 0)
+                    caster->RemoveSpellCooldown(spellInfo->Id, itr->second.needSendToClient);
+
+                if (spellInfo->CategoryRecoveryTime > 0)
+                    caster->RemoveCategoryCooldown(spellInfo->GetCategory());
             }
         }
     }