diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index 6e1e4529..63d10961 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -119,18 +119,23 @@ public class DisguiseUtilities {
                 team.setOption(Option.NAME_TAG_VISIBILITY, nameVisible ? OptionStatus.ALWAYS : OptionStatus.NEVER);
             }
 
-            team.setOption(Option.COLLISION_RULE, OptionStatus.NEVER);
+            if (team.getOption(Option.COLLISION_RULE) != OptionStatus.NEVER) {
+                team.setOption(Option.COLLISION_RULE, OptionStatus.NEVER);
+            }
 
-            if (disguise.getWatcher().getGlowColor() != null) {
+            if (disguise.getWatcher().getGlowColor() != team.getColor()) {
                 team.setColor(disguise.getWatcher().getGlowColor());
             }
 
-            if (NmsVersion.v1_13.isSupported()) {
-                team.setPrefix("Colorize");
-                team.setSuffix("Colorize");
-            } else {
-                team.setPrefix(getPrefix());
-                team.setSuffix(getSuffix());
+            String prefix = NmsVersion.v1_13.isSupported() ? "Colorize" : getPrefix();
+            String suffix = NmsVersion.v1_13.isSupported() ? "Colorize" : getSuffix();
+
+            if (!prefix.equals(team.getPrefix())) {
+                team.setPrefix(prefix);
+            }
+
+            if (!suffix.equals(team.getSuffix())) {
+                team.setSuffix(suffix);
             }
         }
     }