diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8af429623..4d2790ca7 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -6990,7 +6990,7 @@ void Player::UpdateEquipSpellsAtFormChange()
 
 void Player::CastItemCombatSpell(Unit* Target, WeaponAttackType attType)
 {
-    Item *item = GetWeaponForAttack(attType, true);
+    Item *item = GetWeaponForAttack(attType, false);
     if(!item || item->IsBroken())
         return;
 
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 0b60f28a4..c643b9c1c 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12092,9 +12092,6 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura* aura, SpellEntry con
             else
                 item = ((Player*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED);
 
-            if (!((Player*)this)->IsUseEquipedWeapon(attType==BASE_ATTACK))
-                return false;
-
             if(!item || item->IsBroken() || item->GetProto()->Class != ITEM_CLASS_WEAPON || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask))
                 return false;
         }