diff --git a/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
index b24a935f..40cc1fa6 100644
--- a/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
+++ b/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java
@@ -189,7 +189,11 @@ public abstract class DisguiseBaseCommand implements CommandExecutor {
         Team team = ((Player) player).getScoreboard().getEntryTeam(player.getName());
 
         if (team == null) {
-            return player.getName();
+            team = ((Player) player).getScoreboard().getEntryTeam(((Player) player).getUniqueId().toString());
+
+            if (team == null) {
+                return player.getName();
+            }
         }
 
         return team.getPrefix() + team.getColor() + player.getName() + team.getSuffix();