diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
index ac8b00d0..195eb30a 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -368,8 +368,8 @@ public abstract class Disguise {
         if (isDynamicName()) {
             String name = getEntity().getCustomName();
 
-            if (name == null) {
-                name = "";
+            if (name == null || name.isEmpty()) {
+                name = isPlayerDisguise() ? "LD_NoName" : "";
             }
 
             if (isPlayerDisguise()) {
diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
index 43f661ba..7cce1d29 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
@@ -307,6 +307,10 @@ public class PlayerDisguise extends TargetedDisguise {
             name = DisguiseUtilities.getDisplayName(name);
         }
 
+        if (name.equals("")) {
+            name = "LD_NoName";
+        }
+
         if (name.equals(playerName)) {
             return;
         }