diff --git a/modules/CastBar.lua b/modules/CastBar.lua
index ef5de12..b7f6399 100644
--- a/modules/CastBar.lua
+++ b/modules/CastBar.lua
@@ -4,7 +4,7 @@ local CastBar = IceCore_CreateClass(IceCastBar)
 local IceHUD = _G.IceHUD
 
 CastBar.prototype.spellCastSent = nil
-
+CastBar.prototype.sentSpell = nil
 
 -- Constructor --
 function CastBar.prototype:init()
@@ -409,6 +409,7 @@ function CastBar.prototype:SpellCastSent(event, unit, spell, rank, target)
 	if (unit ~= self.unit) then return end
 
 	self.spellCastSent = GetTime()
+	self.sentSpell = spell
 end
 
 -- OVERRIDE
@@ -420,6 +421,10 @@ function CastBar.prototype:SpellCastStart(event, unit, spell, rank)
 		return
 	end
 
+	if self.sentSpell ~= spell then
+		self.spellCastSent = nil
+	end
+
 	local scale
 	if self.unit == "vehicle" then
 		scale = 0