diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
index 0f35bef1..199193c4 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
@@ -199,7 +199,7 @@ public class PlayerDisguise extends TargetedDisguise {
             name = name.substring(0, 16);
         }
 
-        if (isDisguiseInUse()) {
+        if (isDisguiseInUse() && isShowName()) {
             if (stopDisguise()) {
                 playerName = name;