diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 690e662f75..a59a335321 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1027,6 +1027,10 @@ public class CraftEventFactory {
             cause = DamageCause.DRYOUT;
         } else if (source.is(DamageTypes.FREEZE)) {
             cause = DamageCause.FREEZE;
+        } else if (source.is(DamageTypes.GENERIC_KILL)) {
+            cause = DamageCause.KILL;
+        } else if (source.is(DamageTypes.OUTSIDE_BORDER)) {
+            cause = DamageCause.WORLD_BORDER;
         } else {
             cause = DamageCause.CUSTOM;
         }