diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch
index 8e7e9234b6..6475c17f43 100644
--- a/patches/api/Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/Fix-Spigot-annotation-mistakes.patch
@@ -742,6 +742,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public abstract EnchantmentTarget getItemTarget();
  
      /**
+diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
++++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
+@@ -0,0 +0,0 @@ public interface AbstractArrow extends Projectile {
+      *
+      * @return The firing ItemStack
+      */
+-    @NotNull
++    @Nullable // Paper
+     @ApiStatus.Experimental
+     public ItemStack getWeapon();
+ 
 diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Enderman.java
diff --git a/patches/server/More-Projectile-API.patch b/patches/server/More-Projectile-API.patch
index 3fdeea1126..813294bca6 100644
--- a/patches/server/More-Projectile-API.patch
+++ b/patches/server/More-Projectile-API.patch
@@ -201,6 +201,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      @Override
      public boolean isInBlock() {
+@@ -0,0 +0,0 @@ public class CraftAbstractArrow extends AbstractProjectile implements AbstractAr
+ 
+     @Override
+     public ItemStack getWeapon() {
++        if (this.getHandle().getWeaponItem() == null) return null; // Paper - fix NPE
+         return CraftItemStack.asBukkitCopy(this.getHandle().getWeaponItem());
+     }
+ 
 @@ -0,0 +0,0 @@ public class CraftAbstractArrow extends AbstractProjectile implements AbstractAr
      public String toString() {
          return "CraftArrow";