diff --git a/FightSystem_API/src/de/steamwar/fightsystem/Config.java b/FightSystem_API/src/de/steamwar/fightsystem/Config.java
index 1fcf4e8..59ebb26 100644
--- a/FightSystem_API/src/de/steamwar/fightsystem/Config.java
+++ b/FightSystem_API/src/de/steamwar/fightsystem/Config.java
@@ -384,6 +384,6 @@ public class Config {
         return ArenaMode.Test.contains(mode);
     }
     public static boolean recording(){
-        return mode == ArenaMode.EVENT;
+        return true;//mode == ArenaMode.EVENT;
     }
 }
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/Recording.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/Recording.java
index 01ec8f0..5084ae1 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/Recording.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/Recording.java
@@ -101,7 +101,7 @@ public class Recording implements Listener {
                 despawnTNT();
             }
         }.register();
-        new StateDependent(Config.recording(), FightState.All) {
+        new StateDependent(Config.recording(), FightState.Ingame) {
             @Override
             public void enable() {
                 ProtocolLibrary.getProtocolManager().addPacketListener(BOW_PACKET_PROCESSOR);
@@ -157,15 +157,14 @@ public class Recording implements Listener {
         if(e.getEntityType() != EntityType.PLAYER)
             return;
 
-        if(e.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK || e.getCause() == EntityDamageEvent.DamageCause.FIRE)
-            RecordSystem.setOnFire(e.getEntity(), false);
-
-
         Player p = (Player) e.getEntity();
         if(isNotSent(p))
             return;
 
         RecordSystem.damageAnimation(p);
+
+        if(e.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK || e.getCause() == EntityDamageEvent.DamageCause.FIRE)
+            RecordSystem.setOnFire(p, false);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -173,7 +172,11 @@ public class Recording implements Listener {
         if(e.getEntityType() != EntityType.PLAYER)
             return;
 
-        RecordSystem.setOnFire(e.getEntity(), false);
+        Player p = (Player) e.getEntity();
+        if(isNotSent(p))
+            return;
+
+        RecordSystem.setOnFire(p, false);
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)