diff --git a/ShestakUI/Modules/Auras/Filger.lua b/ShestakUI/Modules/Auras/Filger.lua
index 27da9b239..169893a54 100644
--- a/ShestakUI/Modules/Auras/Filger.lua
+++ b/ShestakUI/Modules/Auras/Filger.lua
@@ -382,7 +382,8 @@ function Filger:OnEvent(event, unit, _, castID)
 					end
 				end
 				if T.Classic and HasWandEquipped() then
-					local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
+					local wandID = GetInventoryItemID("player", 18)
+					local wandSpeed = select(2, C_Container.GetItemCooldown(wandID)) 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 6c32a62be..d53b3dbe7 100644
--- a/ShestakUI/Modules/Blizzard/Bags.lua
+++ b/ShestakUI/Modules/Blizzard/Bags.lua
@@ -223,7 +223,8 @@ function Stuffing:SlotUpdate(b)
 	if b.cooldown and StuffingFrameBags and StuffingFrameBags:IsShown() then
 		local start, duration, enable = C_Container.GetContainerItemCooldown(b.bag, b.slot)
 		if T.Classic and HasWandEquipped() then
-			local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
+			local wandID = GetInventoryItemID("player", 18)
+			local wandSpeed = select(2, C_Container.GetItemCooldown(wandID)) or 0
 			if wandSpeed == 0 then
 				CooldownFrame_Set(b.cooldown, start, duration, enable)
 			else
@@ -383,7 +384,8 @@ function Stuffing:UpdateCooldowns(b)
 	if b.cooldown and StuffingFrameBags and StuffingFrameBags:IsShown() then
 		local start, duration, enable = C_Container.GetContainerItemCooldown(b.bag, b.slot)
 		if T.Classic and HasWandEquipped() then
-			local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
+			local wandID = GetInventoryItemID("player", 18)
+			local wandSpeed = select(2, C_Container.GetItemCooldown(wandID)) 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 ae0b2ed82..c49235efd 100644
--- a/ShestakUI/Modules/Cooldowns/EnemyCD.lua
+++ b/ShestakUI/Modules/Cooldowns/EnemyCD.lua
@@ -132,7 +132,8 @@ local StartTimer = function(sGUID, sID, sName)
 	icon:SetScript("OnEnter", OnEnter)
 	icon:SetScript("OnLeave", GameTooltip_Hide)
 	if T.Classic and HasWandEquipped() then
-		local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
+		local wandID = GetInventoryItemID("player", 18)
+		local wandSpeed = select(2, C_Container.GetItemCooldown(wandID)) 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 8cf96415c..107788de2 100644
--- a/ShestakUI/Modules/Quests/AutoButton.lua
+++ b/ShestakUI/Modules/Quests/AutoButton.lua
@@ -141,7 +141,8 @@ local function startScanningBags()
 				AutoButton:SetScript("OnUpdate", function()
 					local cd_start, cd_finish, cd_enable = C_Container.GetContainerItemCooldown(b, s)
 					if T.Classic then
-						local wandSpeed = select(2, GetInventoryItemCooldown("player", 18)) or 0
+						local wandID = GetInventoryItemID("player", 18)
+						local wandSpeed = select(2, C_Container.GetItemCooldown(wandID)) 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)