Index: C:/Users/spidee/Documents/Wcell/WCell.RealmServer/Spells/SpellHandler.cs
===================================================================
--- C:/Users/spidee/Documents/Wcell/WCell.RealmServer/Spells/SpellHandler.cs	(revision 173)
+++ C:/Users/spidee/Documents/Wcell/WCell.RealmServer/Spells/SpellHandler.cs	(working copy)
@@ -437,6 +437,12 @@
 			if (caster == null)
 				return;
 
+            if (delay == 0)
+            {
+                caster.SetUInt32(UnitFields.UNIT_FIELD_CHANNEL_OBJECT, (uint)0);
+                caster.SetUInt32(UnitFields.UNIT_CHANNEL_SPELL, (uint)0);
+            }
+
 			using (RealmPacketOut packet = new RealmPacketOut(RealmServerOpCode.MSG_CHANNEL_UPDATE, 12)) {
 				caster.EntityId.WritePacked(packet);
 				packet.Write(delay);