diff --git a/Source/Framework/Constants/Spells/SpellConst.cs b/Source/Framework/Constants/Spells/SpellConst.cs
index 662b89bb7..8a929e776 100644
--- a/Source/Framework/Constants/Spells/SpellConst.cs
+++ b/Source/Framework/Constants/Spells/SpellConst.cs
@@ -1809,7 +1809,7 @@ namespace Framework.Constants
         AiPrimaryRangedAttack = 0x4000, /*Nyi*/ // Ai Primary Ranged Attack
         NoPushback = 0x8000, /*Nyi*/ // No Pushback
         NoJumpPathing = 0x10000, /*Nyi*/ // No Jump Pathing
-        AllowEquipWhileCasting = 0x20000, /*Nyi*/ // Allow Equip While Casting
+        AllowEquipWhileCasting = 0x20000, // Allow Equip While Casting
         OriginateFromController = 0x40000, // Originate From Controller Description Client Will Prevent Casting If Not Possessed, Charmer Will Be Caster For All Intents And Purposes
         DelayCombatTimerDuringCast = 0x80000, /*Nyi*/ // Delay Combat Timer During Cast
         AuraIconOnlyForCasterLimit10 = 0x100000, // Aura Icon Only For Caster (Limit 10) (Client Only)
diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs
index 25b732af1..afcbbac01 100644
--- a/Source/Game/Entities/Player/Player.Items.cs
+++ b/Source/Game/Entities/Player/Player.Items.cs
@@ -4942,8 +4942,15 @@ namespace Game.Entities
                         if (IsInCombat() && (pProto.GetClass() == ItemClass.Weapon || pProto.GetInventoryType() == InventoryType.Relic) && m_weaponChangeTimer != 0)
                             return InventoryResult.ItemCooldown;
 
-                        if (IsNonMeleeSpellCast(false))
-                            return InventoryResult.ClientLockedOut;
+                        Spell currentGenericSpell = GetCurrentSpell(CurrentSpellTypes.Generic);
+                        if (currentGenericSpell != null)
+                            if (!currentGenericSpell.GetSpellInfo().HasAttribute(SpellAttr6.AllowEquipWhileCasting))
+                                return InventoryResult.ClientLockedOut;
+
+                        Spell currentChanneledSpell = GetCurrentSpell(CurrentSpellTypes.Channeled);
+                        if (currentChanneledSpell != null)
+                            if (!currentChanneledSpell.GetSpellInfo().HasAttribute(SpellAttr6.AllowEquipWhileCasting))
+                                return InventoryResult.ClientLockedOut;
                     }
 
                     ContentTuningLevels? requiredLevels = null;