diff --git a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
index 9badc90c..3584a7fc 100644
--- a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
+++ b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
@@ -25,6 +25,10 @@ public class FTeamWrapper {
             return;
         }
 
+        if (faction.isNone()) {
+            return;
+        }
+
         if (!P.p.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
             return;
         }
@@ -46,6 +50,10 @@ public class FTeamWrapper {
             return;
         }
 
+        if (faction.isNone()) {
+            return;
+        }
+
         if (!P.p.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
             return;
         }