diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java
index 4ab43095..9b2afb91 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java
@@ -43,7 +43,13 @@ public class PacketListenerScoreboardTeam extends PacketAdapter {
                     continue;
                 }
 
-                team = ((PlayerDisguise) disguise).getScoreboardName();
+                DisguiseUtilities.DScoreTeam t = ((PlayerDisguise) disguise).getScoreboardName();
+
+                if (!t.getTeamName().equals(name)) {
+                    continue;
+                }
+
+                team = t;
                 break loop;
             }
         }