diff --git a/Spigot-Server-Patches/Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/Show-blockstate-location-if-we-failed-to-read-it.patch
index 046eb9c9c7..83e68772ed 100644
--- a/Spigot-Server-Patches/Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 7cb4c3e503..ae60e037a5 100644
+index 7cb4c3e503..c3405950d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -0,0 +0,0 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -21,12 +21,14 @@ index 7cb4c3e503..ae60e037a5 100644
              this.load(this.snapshot);
          }
          // Paper end
++        // Paper start - show location on failure
 +        } catch (Throwable thr) {
 +            if (thr instanceof ThreadDeath) {
 +                throw (ThreadDeath)thr;
 +            }
 +            throw new RuntimeException("Failed to read block state at location: (" + block.getX() + ", " + block.getY() + ", " + block.getZ() + ")", thr);
 +        }
++        // Paper end
      }
  
      public final boolean snapshotDisabled; // Paper