diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
index 7cce1d29..336ec18f 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
@@ -661,8 +661,8 @@ public class PlayerDisguise extends TargetedDisguise {
         if (isDynamicName()) {
             String name = getEntity().getCustomName();
 
-            if (name == null) {
-                name = "";
+            if (name == null || name.isEmpty()) {
+                name = "LD_NoName";
             }
 
             if (!getName().equals(name)) {