diff --git a/paper-server/patches/sources/net/minecraft/world/inventory/ContainerLevelAccess.java.patch b/paper-server/patches/sources/net/minecraft/world/inventory/ContainerLevelAccess.java.patch
index d49f99525..d146703cc 100644
--- a/paper-server/patches/sources/net/minecraft/world/inventory/ContainerLevelAccess.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/inventory/ContainerLevelAccess.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/inventory/ContainerLevelAccess.java
 +++ b/net/minecraft/world/inventory/ContainerLevelAccess.java
-@@ -8,6 +8,20 @@
+@@ -8,16 +8,48 @@
  
  public interface ContainerLevelAccess {
  
@@ -21,7 +21,15 @@
      ContainerLevelAccess NULL = new ContainerLevelAccess() {
          @Override
          public <T> Optional<T> evaluate(BiFunction<Level, BlockPos, T> getter) {
-@@ -17,7 +31,19 @@
+             return Optional.empty();
+         }
++        // Paper start - fix menus with empty level accesses
++        @Override
++        public org.bukkit.Location getLocation() {
++            return null;
++        }
++        // Paper end - fix menus with empty level accesses
+     };
  
      static ContainerLevelAccess create(final Level world, final BlockPos pos) {
          return new ContainerLevelAccess() {