diff --git a/src/main/java/com/massivecraft/factions/scoreboards/FScoreboard.java b/src/main/java/com/massivecraft/factions/scoreboards/FScoreboard.java
index 9d0efd4c..04fe86bc 100644
--- a/src/main/java/com/massivecraft/factions/scoreboards/FScoreboard.java
+++ b/src/main/java/com/massivecraft/factions/scoreboards/FScoreboard.java
@@ -40,8 +40,10 @@ public class FScoreboard {
     public static void remove(FPlayer fplayer) {
         FScoreboard fboard = fscoreboards.remove(fplayer);
 
-        fboard.removed = true;
-        FTeamWrapper.untrack(fboard);
+        if (fboard != null) {
+            fboard.removed = true;
+            FTeamWrapper.untrack(fboard);
+        }
     }
 
     public static FScoreboard get(FPlayer fplayer) {