diff --git a/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
index e0aab30b..b6919b43 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
@@ -99,7 +99,7 @@ public class PlayerDisguise extends TargetedDisguise {
                     public void onLookup(WrappedGameProfile gameProfile) {
                         if (currentLookup == this && gameProfile != null) {
                             setSkin(gameProfile);
-                            if (DisguiseUtilities.isDisguiseInUse(PlayerDisguise.this)) {
+                            if (!gameProfile.getProperties().isEmpty() && DisguiseUtilities.isDisguiseInUse(PlayerDisguise.this)) {
                                 DisguiseUtilities.refreshTrackers(PlayerDisguise.this);
                             }
                         }
diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index 100b3674..e6e7115a 100644
--- a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -343,7 +343,9 @@ public class DisguiseUtilities {
                 if (remove) {
                     getAddedByPlugins().remove(disguise.getName().toLowerCase());
                 }
-                if (DisguiseAPI.isDisguiseInUse(disguise)) {
+                if (DisguiseAPI.isDisguiseInUse(disguise)
+                        && (!gameProfile.getName().equals(disguise.getName()) || !gameProfile.getProperties().isEmpty())) {
+                    // TODO Resend for UUID? Might need to in the future.
                     DisguiseUtilities.refreshTrackers(disguise);
                 }
             }