diff --git a/filter.lua b/filter.lua
index 803158c..3ee3dfb 100644
--- a/filter.lua
+++ b/filter.lua
@@ -66,8 +66,8 @@ function Cursive:ShouldDisplayGuid(guid)
 		return true
 	end
 
-	-- always show raid marks if attackable
-	if filter.icon(guid) and filter.attackable(guid) then
+	-- always show raid marks if attackable and not in combat or this guid is affecting combat
+	if filter.icon(guid) and filter.attackable(guid) and (not UnitAffectingCombat("player") or UnitAffectingCombat(guid)) then
 		return true
 	end