diff --git a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
index 191019746..2450ab025 100644
--- a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
@@ -37,6 +37,8 @@ public class ScoreboardTrait extends Trait {
 
     public void apply(boolean nameVisibility) {
         Team team = getTeam();
+        if (team == null)
+            return;
 
         if (!Setting.USE_SCOREBOARD_TEAMS.asBoolean()) {
             team.unregister();