diff --git a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
index 5f3b563a..271e900e 100644
--- a/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
+++ b/src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java
@@ -26,6 +26,11 @@ public class FTeamWrapper {
             return;
         }
 
+        if (!P.p.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
+            return;
+        }
+
+
         if (updating.add(faction)) {
             Bukkit.getScheduler().runTask(P.p, new Runnable() {
                 @Override
@@ -42,6 +47,10 @@ public class FTeamWrapper {
             return;
         }
 
+        if (!P.p.getConfig().getBoolean("scoreboard.default-prefixes", false)) {
+            return;
+        }
+
         if (updating.contains(faction)) {
             // Faction will be updated soon.
             return;