diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java
index 18280081..fbca955c 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/CastSpellEntity.java
@@ -136,11 +136,10 @@ public class CastSpellEntity extends LightEmittingEntity implements Caster<CastS
             }
 
             spells.getSlots().get().ifPresent(spell -> {
-                var entry = Ether.get(getWorld()).getOrCreate(spell, this);
-                if (entry.hasChanged()) {
-                    //updatePositionAndAngles(getX(), getY(), getZ(), entry.getYaw(), entry.getPitch());
-                }
+                Ether.get(getWorld()).getOrCreate(spell, this);
             });
+        } else if (isDead()) {
+            spells.getSlots().clear();
         }
 
         prevDeathTicks = deathTicks;
@@ -152,7 +151,7 @@ public class CastSpellEntity extends LightEmittingEntity implements Caster<CastS
 
     @Override
     public void kill() {
-        spells.getSlots().clear();
+        setDead(true);
     }
 
     public boolean isDead() {