diff --git a/patches/minecraft/net/minecraft/world/level/block/entity/BlockEntity.java.patch b/patches/minecraft/net/minecraft/world/level/block/entity/BlockEntity.java.patch
index 44c7795464..23b5bde849 100644
--- a/patches/minecraft/net/minecraft/world/level/block/entity/BlockEntity.java.patch
+++ b/patches/minecraft/net/minecraft/world/level/block/entity/BlockEntity.java.patch
@@ -43,7 +43,7 @@
      }
  
      protected void saveAdditional(ValueOutput p_407573_) {
-+        if (getCapabilities() != null) p_407573_.storeNullable("ForgeCaps", CompoundTag.CODEC, serializeCaps(this.level.registryAccess()));
++        if (getCapabilities() != null && this.level != null) p_407573_.storeNullable("ForgeCaps", CompoundTag.CODEC, serializeCaps(this.level.registryAccess()));
      }
  
      public final CompoundTag saveWithFullMetadata(HolderLookup.Provider p_331193_) {