diff --git a/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 9e64ecebf76..5b4bf3815de 100644
--- a/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -30,7 +30,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void readAdditionalSaveData(CompoundTag nbt) {
          super.readAdditionalSaveData(nbt);
          this.reassessWeaponGoal();
-+        this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Paper
++        // Paper start
++        if (nbt.contains("Paper.ShouldBurnInDay")) {
++            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
++        }
++        // Paper end
 +    }
 +
 +    // Paper start
@@ -60,7 +64,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (nbt.hasUUID("Paper.SpawningEntity")) {
              this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
          }
-+        this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
++        if (nbt.contains("Paper.ShouldBurnInDay")) {
++            this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
++        }
          // Paper end
      }