diff --git a/patches/server/Fix-chiseled-bookshelf-setItem-with-air.patch b/patches/server/Fix-chiseled-bookshelf-setItem-with-air.patch
new file mode 100644
index 0000000000..e3b76ae33c
--- /dev/null
+++ b/patches/server/Fix-chiseled-bookshelf-setItem-with-air.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Sat, 18 Mar 2023 18:51:33 +0100
+Subject: [PATCH] Fix chiseled bookshelf setItem with air
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/ChiseledBookShelfBlockEntity.java
+@@ -0,0 +0,0 @@ public class ChiseledBookShelfBlockEntity extends BlockEntity implements Contain
+ 
+     @Override
+     public void setItem(int slot, ItemStack stack) {
+-        if (stack.is(ItemTags.BOOKSHELF_BOOKS)) {
++        if (stack.isEmpty() || stack.is(ItemTags.BOOKSHELF_BOOKS)) { // Paper
+             this.items.set(slot, stack);
+             this.updateState(slot);
+         }