diff --git a/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
index 0e7c7b5c..029d6291 100644
--- a/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
+++ b/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
@@ -53,8 +53,11 @@ public abstract class DisguiseBaseCommand implements CommandExecutor {
     protected String getDisplayName(CommandSender player) {
         Team team = ((Player) player).getScoreboard().getEntryTeam(player.getName());
 
-        return (team == null ? "" : team.getColor() + team.getPrefix()) + player.getName() +
-                (team == null ? "" : team.getSuffix());
+        if (team == null) {
+            return player.getName();
+        }
+
+        return team.getPrefix() + team.getColor() + player.getName() + team.getSuffix();
     }
 
     protected ArrayList<String> getAllowedDisguises(DisguisePermissions permissions) {