diff --git a/config.yml b/config.yml
index f63c1dbf..83eea23c 100644
--- a/config.yml
+++ b/config.yml
@@ -101,7 +101,7 @@ KeepDisguises:
     EntityDespawn: false
     PlayerDeath: false
     PlayerLogout: false
-  
+
 # This controls if a entitys max health is determined by the entity, or by the disguise.
 # Wither is 200, a player is 20. With this enabled, a player disguised as a wither will have the boss bar health accurate to the players health.
 # Else it will be 1/20 of the boss bar when he is full health.
diff --git a/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
index 472929f9..257e86c7 100644
--- a/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
+++ b/src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
@@ -237,10 +237,7 @@ public class PlayerDisguise extends TargetedDisguise {
 
     @Override
     public boolean startDisguise() {
-        if (isDisguiseInUse() || skinToUse == null)
-            return super.startDisguise();
-
-        if (getGameProfile() == null) {
+        if (!isDisguiseInUse() && skinToUse != null && gameProfile == null) {
             currentLookup = new LibsProfileLookup() {
                 @Override
                 public void onLookup(WrappedGameProfile gameProfile) {