diff --git a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
index 84fffc1..0b85194 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
@@ -2,6 +2,7 @@ package de.diddiz.LogBlock.listeners;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.block.BlockFace;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.ArmorStand;
@@ -201,7 +202,8 @@ public class AdvancedEntityLogging extends LoggingListener {
                 actor = Actor.actorFromEntity(entity.getKiller());
             }
             if (actor == null) {
-                actor = new Actor(event.getDamageSource().getDamageType().toString());
+                NamespacedKey key = event.getDamageSource().getDamageType().getKey();
+                actor = new Actor(key == null ? "unknown" : key.getKey().toUpperCase());
             }
             queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.KILL);
         }
diff --git a/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
index 914c4ee..c6aff64 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
@@ -4,6 +4,7 @@ import de.diddiz.LogBlock.Actor;
 import de.diddiz.LogBlock.LogBlock;
 import de.diddiz.LogBlock.Logging;
 import de.diddiz.LogBlock.config.Config.*;
+import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Monster;
@@ -38,7 +39,10 @@ public class KillLogging extends LoggingListener {
                 } else if (logKillsLevel == LogKillsLevel.MONSTERS && !((victim instanceof Player || victim instanceof Monster))) {
                     return;
                 }
-                consumer.queueKill(new Actor(deathEvent.getDamageSource().getDamageType().toString()), victim);
+                NamespacedKey key = deathEvent.getDamageSource().getDamageType().getKey();
+                Actor actor = new Actor(key == null ? "unknown" : key.getKey().toUpperCase());
+
+                consumer.queueKill(actor, victim);
             }
         }
     }