diff --git a/ShestakUI/Modules/Auras/Filger.lua b/ShestakUI/Modules/Auras/Filger.lua
index 727002785..8cdb30c01 100644
--- a/ShestakUI/Modules/Auras/Filger.lua
+++ b/ShestakUI/Modules/Auras/Filger.lua
@@ -391,9 +391,8 @@ function Filger:OnEvent(event, unit, _, castID)
 						start, duration = GetInventoryItemCooldown("player", data.slotID)
 					end
 				end
-				if T.Classic and not T.Wrath341 and HasWandEquipped() then
-					local wandID = GetInventoryItemID("player", 18)
-					local wandSpeed = select(2, GetItemCooldown(wandID)) or 0
+				if T.Classic and HasWandEquipped() then
+					local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
 					if wandSpeed < 1.5 then wandSpeed = 1.5 end
 					if name and (duration or 0) > wandSpeed then
 						if not (T.class == "DEATHKNIGHT" and data.filter == "CD" and duration < 10) then -- Filter rune cd
diff --git a/ShestakUI/Modules/Blizzard/Bags.lua b/ShestakUI/Modules/Blizzard/Bags.lua
index 0b4fff7e3..fa7a3d79c 100644
--- a/ShestakUI/Modules/Blizzard/Bags.lua
+++ b/ShestakUI/Modules/Blizzard/Bags.lua
@@ -214,9 +214,8 @@ function Stuffing:SlotUpdate(b)
 
 	if b.cooldown and StuffingFrameBags and StuffingFrameBags:IsShown() then
 		local start, duration, enable = GetContainerItemCooldown(b.bag, b.slot)
-		if T.Classic and not T.Wrath341 and HasWandEquipped() then
-			local wandID = GetInventoryItemID("player", 18)
-			local wandSpeed = GetItemCooldown(wandID)
+		if T.Classic and HasWandEquipped() then
+			local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
 			if wandSpeed == 0 then
 				CooldownFrame_Set(b.cooldown, start, duration, enable)
 			else
@@ -353,9 +352,8 @@ end
 function Stuffing:UpdateCooldowns(b)
 	if b.cooldown and StuffingFrameBags and StuffingFrameBags:IsShown() then
 		local start, duration, enable = GetContainerItemCooldown(b.bag, b.slot)
-		if T.Classic and not T.Wrath341 and HasWandEquipped() then
-			local wandID = GetInventoryItemID("player", 18)
-			local wandSpeed = GetItemCooldown(wandID)
+		if T.Classic and HasWandEquipped() then
+			local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
 			if wandSpeed == 0 then
 				CooldownFrame_Set(b.cooldown, start, duration, enable)
 			else
diff --git a/ShestakUI/Modules/Cooldowns/EnemyCD.lua b/ShestakUI/Modules/Cooldowns/EnemyCD.lua
index fa2a894ee..2e92b202a 100644
--- a/ShestakUI/Modules/Cooldowns/EnemyCD.lua
+++ b/ShestakUI/Modules/Cooldowns/EnemyCD.lua
@@ -131,9 +131,8 @@ local StartTimer = function(sGUID, sID, sName)
 	icon:SetScript("OnUpdate", IconUpdate)
 	icon:SetScript("OnEnter", OnEnter)
 	icon:SetScript("OnLeave", GameTooltip_Hide)
-	if T.Classic and not T.Wrath341 and HasWandEquipped() then
-		local wandID = GetInventoryItemID("player", 18)
-		local wandSpeed = GetItemCooldown(wandID)
+	if T.Classic and HasWandEquipped() then
+		local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
 		if wandSpeed < 1.5 then wandSpeed = 1.5 end
 		if (T.enemy_spells[sID] or 0) > wandSpeed then
 			return CooldownFrame_Set(icon.Cooldown, GetTime(), T.EnemySpells[sID], 1)
diff --git a/ShestakUI/Modules/Quests/AutoButton.lua b/ShestakUI/Modules/Quests/AutoButton.lua
index cf73a8673..837b30ac8 100644
--- a/ShestakUI/Modules/Quests/AutoButton.lua
+++ b/ShestakUI/Modules/Quests/AutoButton.lua
@@ -99,9 +99,8 @@ Scanner:SetScript("OnEvent", function()
 
 				AutoButton:SetScript("OnUpdate", function()
 					local cd_start, cd_finish, cd_enable = GetContainerItemCooldown(b, s)
-					if T.Classic and not T.Wrath341 then
-						local wandID = GetInventoryItemID("player", 18)
-						local wandSpeed = GetItemCooldown(wandID)
+					if T.Classic then
+						local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
 						if wandSpeed < 1.5 then wandSpeed = 1.5 end
 						if (cd_finish or 0) > wandSpeed then
 							return CooldownFrame_Set(AutoButton.cd, cd_start, cd_finish, cd_enable)