diff --git a/Classic/ZulFarrak/Antusul.lua b/Classic/ZulFarrak/Antusul.lua
index 99d717b00..4227207af 100644
--- a/Classic/ZulFarrak/Antusul.lua
+++ b/Classic/ZulFarrak/Antusul.lua
@@ -46,7 +46,7 @@ function mod:OnBossEnable()
 	self:Log("SPELL_CAST_START", "HealingWaveOfAntusul", 11895)
 	self:Log("SPELL_CAST_SUCCESS", "AntusulsMinion", 11894)
 	self:Log("SPELL_AURA_APPLIED", "PetrifyApplied", 11020)
-	if self:Heroic() then -- no encounter events in Timewalking
+	if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
 		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 		self:Death("Win", 8127)
 	end
diff --git a/Classic/ZulFarrak/ChiefUkorzSandscalp.lua b/Classic/ZulFarrak/ChiefUkorzSandscalp.lua
index 68e284482..1e6198785 100644
--- a/Classic/ZulFarrak/ChiefUkorzSandscalp.lua
+++ b/Classic/ZulFarrak/ChiefUkorzSandscalp.lua
@@ -31,7 +31,7 @@ function mod:OnBossEnable()
 	if self:Retail() then
 		self:Log("SPELL_AURA_APPLIED", "EnrageApplied", 454632)
 	end
-	if self:Heroic() then -- no encounter events in Timewalking
+	if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
 		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 		self:Death("Win", 7267)
 	end
diff --git a/Classic/ZulFarrak/Gahzrilla.lua b/Classic/ZulFarrak/Gahzrilla.lua
index 95d7e0ddc..7bfd1fb69 100644
--- a/Classic/ZulFarrak/Gahzrilla.lua
+++ b/Classic/ZulFarrak/Gahzrilla.lua
@@ -24,7 +24,7 @@ function mod:OnBossEnable()
 	self:Log("SPELL_AURA_APPLIED", "FreezeSolidApplied", 11836)
 	self:Log("SPELL_CAST_START", "GahzrillaSlam", 11902)
 	self:Log("SPELL_CAST_SUCCESS", "GahzrillaSlamSuccess", 11902)
-	if self:Heroic() then -- no encounter events in Timewalking
+	if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
 		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 		self:Death("Win", 7273)
 	end
diff --git a/Classic/ZulFarrak/NekrumAndSezzziz.lua b/Classic/ZulFarrak/NekrumAndSezzziz.lua
index 921baccbd..367c40026 100644
--- a/Classic/ZulFarrak/NekrumAndSezzziz.lua
+++ b/Classic/ZulFarrak/NekrumAndSezzziz.lua
@@ -47,7 +47,7 @@ function mod:OnBossEnable()
 	self:Log("SPELL_INTERRUPT", "HealInterrupt", 12039)
 	self:Log("SPELL_CAST_SUCCESS", "HealSuccess", 12039)
 
-	if self:Heroic() then -- no encounter events in Timewalking
+	if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
 		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 	end
 	self:Death("BossDeath", 7796, 7275)
@@ -123,7 +123,7 @@ end
 
 function mod:BossDeath(args)
 	deaths = deaths + 1
-	if self:Heroic() and deaths == 2 then -- no encounter events in Timewalking
+	if (self:Heroic() or (self:Classic() and not self:Vanilla())) and deaths == 2 then -- no encounter events in Timewalking
 		deaths = 0
 		self:Win()
 	elseif args.mobId == 7796 then -- Nekrum Gutchewer
diff --git a/Classic/ZulFarrak/Theka.lua b/Classic/ZulFarrak/Theka.lua
index f3b10ed08..fb939cab5 100644
--- a/Classic/ZulFarrak/Theka.lua
+++ b/Classic/ZulFarrak/Theka.lua
@@ -31,10 +31,10 @@ function mod:OnBossEnable()
 		self:Log("SPELL_AURA_APPLIED", "ShadowWordPainApplied", 15654)
 		self:Log("SPELL_CAST_SUCCESS", "CurseOfTheMartyr", 450933)
 		self:Log("SPELL_AURA_APPLIED", "CurseOfTheMartyrApplied", 450933)
-		if self:Heroic() then -- no encounter events in Timewalking
-			self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
-			self:Death("Win", 7272)
-		end
+	end
+	if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 7272)
 	end
 end
 
diff --git a/Classic/ZulFarrak/Velratha.lua b/Classic/ZulFarrak/Velratha.lua
index 0e9bb5df9..52b29ecbf 100644
--- a/Classic/ZulFarrak/Velratha.lua
+++ b/Classic/ZulFarrak/Velratha.lua
@@ -24,7 +24,7 @@ function mod:OnBossEnable()
 	self:Log("SPELL_INTERRUPT", "HealingWaveInterrupt", 15982)
 	self:Log("SPELL_CAST_SUCCESS", "HealingWaveSuccess", 15982)
 	self:Log("SPELL_CAST_START", "CrashingWave", 78802)
-	if self:Heroic() then -- no encounter events in Timewalking
+	if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
 		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 		self:Death("Win", 7795)
 	end
diff --git a/Classic/ZulFarrak/Zumrah.lua b/Classic/ZulFarrak/Zumrah.lua
index e95d7876d..14ff5a716 100644
--- a/Classic/ZulFarrak/Zumrah.lua
+++ b/Classic/ZulFarrak/Zumrah.lua
@@ -29,7 +29,7 @@ function mod:OnBossEnable()
 	self:Log("SPELL_INTERRUPT", "HealingWaveInterrupt", 15982)
 	self:Log("SPELL_CAST_SUCCESS", "HealingWaveSuccess", 15982)
 	self:Log("SPELL_CAST_START", "ShadowBoltVolley", 17228)
-	if self:Heroic() then -- no encounter events in Timewalking
+	if self:Heroic() or (self:Classic() and not self:Vanilla()) then -- no encounter events in Timewalking or Cataclysm Classic
 		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
 		self:Death("Win", 7271)
 	end