diff --git a/Spigot-Server-Patches/Entity-Origin-API.patch b/Spigot-Server-Patches/Entity-Origin-API.patch
index 964b2b102..c24ed2ee2 100644
--- a/Spigot-Server-Patches/Entity-Origin-API.patch
+++ b/Spigot-Server-Patches/Entity-Origin-API.patch
@@ -109,7 +109,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start
 +    @Override
 +    public Location getOrigin() {
-+        return getHandle().origin;
++        Location origin = getHandle().origin;
++        return origin == null ? null : origin.clone();
 +    }
 +    // Paper end
  }