diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
index 1ce0c82..a9e961d 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
@@ -26,6 +26,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.BountifulWrapper;
 import de.steamwar.fightsystem.utils.FlatteningWrapper;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
@@ -47,11 +48,17 @@ import org.bukkit.event.inventory.InventoryPickupItemEvent;
 import org.bukkit.event.player.*;
 import org.bukkit.event.weather.WeatherChangeEvent;
 import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.scoreboard.NameTagVisibility;
 import org.bukkit.scoreboard.Team;
 
 public class Permanent implements Listener {
 
     private static final Team spectatorTeam = FightScoreboard.getBukkitTeam("Spectator");
+    static {
+        BountifulWrapper.impl.setNametagVisibility(spectatorTeam);
+        spectatorTeam.setNameTagVisibility(NameTagVisibility.NEVER);
+    }
+
     public static Team getSpectatorTeam() {
         return spectatorTeam;
     }
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
index 893d2b3..c26b0c9 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
@@ -70,7 +70,7 @@ public class PacketProcessor implements Listener {
     private static final org.bukkit.scoreboard.Team team = FightScoreboard.getBukkitTeam("Replay");
     static {
         BountifulWrapper.impl.setNametagVisibility(team);
-        team.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
+        team.setNameTagVisibility(NameTagVisibility.NEVER);
     }
 
     private static PacketProcessor currentProcessor = null;