diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java b/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java
index 9a36a009..96b3997b 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java
@@ -112,7 +112,7 @@ public class WorldRenderDelegate {
         if (pony instanceof Caster<?>) {
             int fireTicks = owner.doesRenderOnFire() ? 1 : 0;
 
-            return ((Caster<?>)pony).getSpellSlot().get(SpellPredicate.IS_DISGUISE, true).map(effect -> {
+            return ((Caster<?>)pony).getSpellSlot().get(SpellPredicate.IS_DISGUISE, false).map(effect -> {
                 effect.update(pony, false);
 
                 EntityAppearance ve = effect.getDisguise();
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
index ad663521..63f933e8 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
@@ -59,12 +59,12 @@ public interface Disguise extends FlightType.Provider, PlayerDimensions.Provider
 
         LivingEntity owner = source.getMaster();
 
-        Entity entity = getDisguise().getOrCreate(source);
-
         if (owner == null) {
             return true;
         }
 
+        Entity entity = getDisguise().getOrCreate(source);
+
         if (entity == null) {
             owner.setInvisible(false);
             if (source instanceof Pony) {