diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
index 5d51a49228..ff82dc9847 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
@@ -87,6 +87,17 @@ public abstract class CraftBoat extends CraftVehicle implements Boat {
 
     @Override
     public Status getStatus() {
+        // Paper start - Fix NPE on Boat getStatus
+        final net.minecraft.world.entity.vehicle.AbstractBoat handle = this.getHandle();
+        if (handle.status == null) {
+            if (handle.valid) {
+                // Don't actually set the status because it would skew the old status check in the next tick
+                return CraftBoat.boatStatusFromNms(handle.getStatus());
+            } else {
+                return Status.NOT_IN_WORLD;
+            }
+        }
+        // Paper end - Fix NPE on Boat getStatus
         return CraftBoat.boatStatusFromNms(this.getHandle().status);
     }