diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index edd2276b69..f4049559dd 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -662,6 +662,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
     @Override
     public boolean addPassenger(org.bukkit.entity.Entity passenger) {
         Preconditions.checkArgument(passenger != null, "passenger == null");
+        Preconditions.checkArgument(!this.equals(passenger), "Entity cannot ride itself.");
 
         return ((CraftEntity) passenger).getHandle().startRiding(getHandle(), true);
     }