diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index df4530399..23795e56e 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2567,12 +2567,11 @@ void Spell::SendSpellCooldown()
 
     Player* _player = (Player*)m_caster;
 
-    // mana/health potions, disabled by client
-    if (m_spellInfo->Category==SPELLCATEGORY_HEALTH_MANA_POTIONS)
+    // mana/health/etc potions, disabled by client (until combat out as declarate)
+    if (m_CastItem && m_CastItem->IsPotion())
     {
         // need in some way provided data for Spell::finish SendCooldownEvent
-        if(m_CastItem)
-            _player->SetLastPotionId(m_CastItem->GetEntry());
+        _player->SetLastPotionId(m_CastItem->GetEntry());
         return;
     }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index d8329e68d..f81c4b84c 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 "7455"
+ #define REVISION_NR "7456"
 #endif // __REVISION_NR_H__