diff --git a/Objects/EXTRABTN.lua b/Objects/EXTRABTN.lua
index e1c917d4..74a0e645 100644
--- a/Objects/EXTRABTN.lua
+++ b/Objects/EXTRABTN.lua
@@ -92,13 +92,8 @@ function EXTRABTN:ExtraButton_Update()
 	end
 
 	_, self.spellID = GetActionInfo(self.actionID)
-
 	self.spellName, _, self.spellIcon = GetSpellInfo(self.spellID);
 
-	if not InCombatLockdown() then
-		self:SetAttribute("action", self.actionID)
-	end
-
 	if self.spellID then
 		self:SetButtonTex()
 
@@ -107,6 +102,10 @@ function EXTRABTN:ExtraButton_Update()
 		if (start) then
 			self:SetCooldownTimer(start, duration, enable, self.cdText, modrate, self.cdcolor1, self.cdcolor2, self.cdAlpha)
 		end
+
+		if not InCombatLockdown() then
+			self:SetAttribute("action", self.actionID)
+		end
 	end