diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
index 66cf9ae..57380a2 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
@@ -185,6 +185,8 @@ public class FightTeam implements IFightTeam{
         player.getInventory().setItem(7, new ItemBuilder(Material.BEACON).removeAllAttributs().setDisplayName("§eRespawn").build());
         if(!Config.test())
             Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), prefix + player.getName()).send(player), 5);
+        if(Config.recording())
+            RecordSystem.playerJoins(player);
         TechHider.reloadChunks(player, chunksToReload);
         return fightPlayer;
     }
@@ -204,6 +206,8 @@ public class FightTeam implements IFightTeam{
         player.teleport(Config.SpecSpawn);
         if(!Config.test())
             new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player);
+        if(Config.recording())
+            RecordSystem.entityDespawns(player);
         TechHider.reloadChunks(player, chunksToReload);
     }
 
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
index 755eb19..7b690a1 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
@@ -55,14 +55,6 @@ public class EventRecordListener extends BasicListener {
         super(Config.recording() ? EnumSet.allOf(FightState.class) : EnumSet.noneOf(FightState.class));
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerJoin(PlayerJoinEvent e){
-        if(isNotSent(e.getPlayer()))
-            return;
-
-        RecordSystem.playerJoins(e.getPlayer());
-    }
-
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent e){
         if(isNotSent(e.getPlayer()))