diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
index 3cba78ba..9db73b3e 100644
--- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
@@ -74,14 +74,14 @@ abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylik
 
     @Inject(method = "writeCustomDataToTag(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("HEAD"))
     private void onWriteCustomDataToTag(CompoundTag tag, CallbackInfo info) {
-        if (tag.contains("unicopia_caster")) {
-            get().fromNBT(tag.getCompound("unicopia_caster"));
-        }
+        tag.put("unicopia_caster", get().toNBT());
     }
 
     @Inject(method = "readCustomDataFromTag(Lnet/minecraft/nbt/CompoundTag;)V", at = @At("HEAD"))
     private void onReadCustomDataFromTag(CompoundTag tag, CallbackInfo info) {
-        tag.put("unicopia_caster", get().toNBT());
+        if (tag.contains("unicopia_caster")) {
+            get().fromNBT(tag.getCompound("unicopia_caster"));
+        }
     }
 
     // ---------- temporary