diff --git a/modules/IndicatorIcons.lua b/modules/IndicatorIcons.lua
index d5c9738..53961e4 100644
--- a/modules/IndicatorIcons.lua
+++ b/modules/IndicatorIcons.lua
@@ -75,8 +75,12 @@ local function Icon_OnFrameUpdate(f)
 					aura.text:SetText(count>1 and count or "")
 				end
 				if showCool then
-					local expiration, duration = status:GetExpirationTime(unit) or 0, status:GetDuration(unit) or 0
-					aura.cooldown:SetCooldown(expiration - duration, duration)
+					local expiration, duration = status:GetExpirationTime(unit), status:GetDuration(unit)
+					if expiration and duration then
+						aura.cooldown:SetCooldown(expiration - duration, duration)
+					else
+						aura.cooldown:SetCooldown(0, 0)
+					end
 				end
 				aura:Show()
 				i = i + 1
diff --git a/modules/StatusAurasBuffs.lua b/modules/StatusAurasBuffs.lua
index 0807ac3..408bb6f 100644
--- a/modules/StatusAurasBuffs.lua
+++ b/modules/StatusAurasBuffs.lua
@@ -21,7 +21,7 @@ local durations = {}
 -- missing buffs
 local mcounts = {1}
 local mexpirations = {0}
-local mdurations = {1073741824}
+local mdurations = mexpirations
 
 -- strict filter management functions
 local function GenSpellsMask(spells)