diff --git a/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java b/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java
index 9f63a73a..032626b4 100644
--- a/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java
+++ b/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java
@@ -185,8 +185,8 @@ public class UnicopiaClient extends UClient {
                 event.setCanceled(true);
             }
 
-            if (iplayer.hasEffect()) {
-                DisguiseRenderer.instance().renderDisguiseToGui(iplayer);
+            if (DisguiseRenderer.instance().renderDisguiseToGui(iplayer)) {
+                event.setCanceled(true);
             }
         }
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/render/DisguiseRenderer.java b/src/main/java/com/minelittlepony/unicopia/render/DisguiseRenderer.java
index 01b96754..ec122a80 100644
--- a/src/main/java/com/minelittlepony/unicopia/render/DisguiseRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/render/DisguiseRenderer.java
@@ -22,7 +22,7 @@ public class DisguiseRenderer {
 
         if (entity.getEntityData().hasKey("disguise") && entity.getEntityData().getBoolean("disguise")) {
 
-            renderMan.setRenderShadow(!SpellDisguise.isAttachedEntity(entity));
+            renderMan.setRenderShadow(true);
             renderDisguise(renderMan, entity);
             renderMan.setRenderShadow(false);
 
@@ -43,7 +43,7 @@ public class DisguiseRenderer {
         double y = entity.posY - observer.posY;
         double z = entity.posZ - observer.posZ;
 
-        renderMan.renderEntity(entity, x, y, z, 0, 0, false);
+        renderMan.renderEntity(entity, x, y, z, 0, 1, false);
 
         entity.getEntityData().setBoolean("disguise", true);
     }