diff --git a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
index c460e72..65ef176 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
@@ -170,6 +170,9 @@ public class AdvancedEntityLogging extends LoggingListener {
                     actor = Actor.actorFromEntity(damager);
                 }
             }
+            if (actor == null && entity.getKiller() != null) {
+                actor = Actor.actorFromEntity(entity.getKiller());
+            }
             if (actor == null) {
                 actor = new Actor(lastDamage == null ? "UNKNOWN" : lastDamage.getCause().toString());
             }
diff --git a/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
index d70a740..3011fc2 100644
--- a/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
+++ b/src/main/java/de/diddiz/LogBlock/listeners/KillLogging.java
@@ -36,6 +36,8 @@ public class KillLogging extends LoggingListener {
                     return;
                 }
                 consumer.queueKill(killer, victim);
+            } else if (deathEvent.getEntity().getKiller() != null) {
+                consumer.queueKill(deathEvent.getEntity().getKiller(), victim);
             } else if (logEnvironmentalKills) {
                 if (logKillsLevel == LogKillsLevel.PLAYERS && !(victim instanceof Player)) {
                     return;