diff --git a/WotLK/Gundrak/Galdarah.lua b/WotLK/Gundrak/Galdarah.lua
index fa4b23002..b7b515998 100644
--- a/WotLK/Gundrak/Galdarah.lua
+++ b/WotLK/Gundrak/Galdarah.lua
@@ -4,7 +4,7 @@
 
 local mod, CL = BigWigs:NewBoss("Gal'darah", 604, 596)
 if not mod then return end
-mod:RegisterEnableMob(29306)
+mod:RegisterEnableMob(29306) -- Gal'darah
 mod:SetEncounterID(mod:Classic() and 390 or 1981)
 mod:SetRespawnTime(30)
 
@@ -55,10 +55,12 @@ do
 		if castId == prev then return end
 		if spellId == 55297 then -- Rhino Form
 			prev = castId
+			self:StopBar(L.form_rhino)
 			self:CDBar("forms", 34.1, L.form_troll, "achievement_character_troll_male")
 			self:DelayedMessage("forms", 29, "yellow", CL.soon:format(L.form_troll))
 		elseif spellId == 55299 then -- Troll Form
 			prev = castId
+			self:StopBar(L.form_troll)
 			self:CDBar("forms", 33.6, L.form_rhino, "ability_hunter_pet_rhino")
 			self:DelayedMessage("forms", 28.5, "yellow", CL.soon:format(L.form_rhino))
 		end