diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
index f6ae5a8d..be466858 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
+++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
@@ -264,12 +264,16 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
             ((EntityTameable)to).setSitting(from.isSneaking());
         }
 
-        if (from.isBurning()) {
-            to.setFire(1);
-        } else {
+        if (from instanceof EntityPlayer && ((EntityPlayer)from).isCreative()) {
             to.extinguish();
         }
 
+        if (to.isBurning()) {
+            from.setFire(1);
+        } else {
+            from.extinguish();
+        }
+
         to.setSneaking(from.isSneaking());
     }