diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
index ebe19d02..12f8aa2a 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
@@ -488,6 +488,12 @@ public class FlagWatcher {
     }
 
     public void setCustomName(String name) {
+        String customName = getCustomName();
+
+        if (Objects.equals(customName, name)) {
+            return;
+        }
+
         if (!getDisguise().isPlayerDisguise() && DisguiseConfig.isArmorstandsName() &&
                 DisguiseConfig.isOverrideCustomNames()) {
             MetaIndex custom =