diff --git a/Cursive.toc b/Cursive.toc
index 84dda03..d19c064 100644
--- a/Cursive.toc
+++ b/Cursive.toc
@@ -1,6 +1,6 @@
 ## Interface: 11200
-## Title: [|CFF33AAFFSUPERWOW|R] Cursive 2.5.3
-## Title-zhCN: [|CFF33AAFFSUPERWOW|R] Cursive 2.5.3
+## Title: [|CFF33AAFFSUPERWOW|R] Cursive 2.5.4
+## Title-zhCN: [|CFF33AAFFSUPERWOW|R] Cursive 2.5.4
 ## Author: Pepopo
 ## Notes: Uses SuperWoW GUIDs to show units in combat and track curses
 ## Notes-zhCN: 使用SuperWoW的GUID功能来显示战斗中的单位并监视诅咒等
diff --git a/curses.lua b/curses.lua
index 173e72b..d32cd40 100644
--- a/curses.lua
+++ b/curses.lua
@@ -39,6 +39,39 @@ local curses = {
 	sharedDebuffGuids = {
 		faeriefire = {}, -- used for scanning for shared debuffs like faerie fire
 	}, -- used for scanning for shared debuffs like faerie fire
+
+	-- Whitelist of mobs that can bleed (for rake tracking at client debuff cap)
+	mobsThatBleed = {
+		["0xF13000F1F3276A33"] = true, -- Keeper Gnarlmoon
+		["0xF13000F1FA276A32"] = true, -- Ley-Watcher Incantagos
+		["0xF13000EA3F276C05"] = true, -- King
+		["0xF13000EA31279058"] = true, -- Queen
+		["0xF13000EA43276C06"] = true, -- Bishop
+		["0xF13000EA44279044"] = true, -- Pawn
+		["0xF13000EA42276C07"] = true, -- Rook
+		["0xF13000EA4D05DA44"] = true, -- Sanv Tas'dal
+		["0xF13000EA57276C04"] = true, -- Kruul
+		["0xF130016C95276DAF"] = true, -- Mephistroth
+
+		["0xF130003E5401591A"] = true, --Anub'Rekhan
+		["0xF130003E510159B0"] = true, --Grand Widow Faerlina
+		["0xF130003E500159A3"] = true, --Maexxna
+		["0xF130003EBD01598C"] = true, --Razuvious
+		["0xF130003EBC01599F"] = true, --Gothik
+		["0xF130003EBF015AB2"] = true, --Zeliek
+		["0xF130003EBE015AB3"] = true, --Mograine
+		["0xF130003EC1015AB1"] = true, --Blaumeux
+		["0xF130003EC0015AB0"] = true, --Thane
+		["0xF130003E52015824"] = true, --Noth
+		["0xF130003E4001588D"] = true, --Heigan
+		["0xF130003E8B0158A2"] = true, --Loatheb
+		["0xF130003E9C0158EA"] = true, --Patchwerk
+		["0xF130003E3B0158EF"] = true, --Grobbulus
+		["0xF130003E3C0158F0"] = true, --Gluth
+		["0xF130003E380159A0"] = true, --Thaddius
+		["0xF130003E75015AB4"] = true, --Sapphiron
+		["0xF130003E76015AED"] = true, --Kel'Thuzad
+	},
 }
 
 -- combat events for curses
@@ -600,9 +633,13 @@ function curses:ApplyCurse(spellID, targetGuid, startTime, duration)
 	local rank = curses.trackedCurseIds[spellID].rank
 
 	if curses.isDruid and name == L["rake"] then
-		if not curses:ScanGuidForCurse(targetGuid, spellID) then
-			-- rake not found on target, do not apply
-			return
+		-- check if mob is in bleed whitelist first
+		-- these bosses are most likely to hit 48 client debuff cap
+		if not curses.mobsThatBleed[targetGuid] then
+			if not curses:ScanGuidForCurse(targetGuid, spellID) then
+				-- rake not found on target, do not apply
+				return
+			end
 		end
 	end