diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
index d33d70fb..395b62f6 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
@@ -169,7 +169,8 @@ public class PacketsManager {
             ProtocolLibrary.getProtocolManager().addPacketListener(mainListener);
             ProtocolLibrary.getProtocolManager().addPacketListener(destroyListener);
 
-            if (NmsVersion.v1_13.isSupported()) {
+            if (NmsVersion.v1_13.isSupported() &&
+                    DisguiseConfig.getPlayerNameType() != DisguiseConfig.PlayerNameType.ARMORSTANDS) {
                 scoreboardTeamListener = new PacketListenerScoreboardTeam();
                 ProtocolLibrary.getProtocolManager().addPacketListener(scoreboardTeamListener);
             }