diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
index 103ce0ee50..f192a2521b 100644
--- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch
@@ -1,4 +1,4 @@
-From 81278a4d41700b713cb97c818585210855c54d41 Mon Sep 17 00:00:00 2001
+From 5302de064828c10daf04722e7f64d61cd46f24ca Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -98,10 +98,10 @@ index 9124558..18d0bd8 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 3b29578..ae2dc49 100644
+index 3b29578..968a0e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -593,4 +593,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -593,4 +593,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -109,7 +109,8 @@ index 3b29578..ae2dc49 100644
 +    // Paper start
 +    @Override
 +    public Location getOrigin() {
-+        return getHandle().origin;
++        Location origin = getHandle().origin;
++        return origin == null ? null : origin.clone();
 +    }
 +    // Paper end
  }