diff --git a/changelog.md b/changelog.md
index 0512ff1..0cc4181 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+v1.15.3:
+
+- Fix custom cooldown bars not working in 11.x (wowace issue #363)
+
 v1.15.2:
 
 - Re-enable right-click context menus on 11.x.
diff --git a/modules/CustomCDBar.lua b/modules/CustomCDBar.lua
index 7f9412b..9191b20 100644
--- a/modules/CustomCDBar.lua
+++ b/modules/CustomCDBar.lua
@@ -637,9 +637,9 @@ function IceCustomCDBar.prototype:GetCooldownDuration(buffName)
 	local localRemaining = nil
 	local localStart, localDuration, hasCooldown = GetSpellCooldown(buffName)
 
-	if (hasCooldown == 1) then
+	if hasCooldown then
 		-- the item has a potential cooldown
-		if (localDuration <= 1.5) then
+		if localDuration <= 1.5 then
 			return nil, nil
 		end
 
@@ -734,7 +734,7 @@ function IceCustomCDBar.prototype:UpdateItemUnitInventoryChanged(event, unit)
 end
 
 function IceCustomCDBar.prototype:UpdateCustomBarEvent(event, unit)
-	if unit ~= self.unit then
+	if unit and unit ~= self.unit then
 		return
 	end
 	if not self.moduleSettings.cooldownType or self.moduleSettings.cooldownType == COOLDOWN_TYPE_SPELL then
diff --git a/this_version.md b/this_version.md
index f148855..baea79d 100644
--- a/this_version.md
+++ b/this_version.md
@@ -1,5 +1,9 @@
 # Changelog
 
+v1.15.3:
+
+- Fix custom cooldown bars not working in 11.x (wowace issue #363)
+
 v1.15.2:
 
 - Re-enable right-click context menus on 11.x.