diff --git a/patches/server/Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/Disable-component-selector-resolving-in-books-by-def.patch
new file mode 100644
index 000000000..e32f322fb
--- /dev/null
+++ b/patches/server/Disable-component-selector-resolving-in-books-by-def.patch
@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Thu, 2 Jun 2022 20:35:58 +0200
+Subject: [PATCH] Disable component selector resolving in books by default
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
+@@ -0,0 +0,0 @@ public class PaperConfig {
+     private static void useProxyProtocol() {
+         useProxyProtocol = getBoolean("settings.proxy-protocol", false);
+     }
++
++    public static boolean resolveSelectorsInBooks;
++    private static void resolveSelectorsInBooks() {
++        resolveSelectorsInBooks = getBoolean("settings.resolve-selectors-in-books", false);
++    }
+ }
+diff --git a/src/main/java/net/minecraft/world/item/WrittenBookItem.java b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/item/WrittenBookItem.java
++++ b/src/main/java/net/minecraft/world/item/WrittenBookItem.java
+@@ -0,0 +0,0 @@ public class WrittenBookItem extends Item {
+ 
+     public static boolean resolveBookComponents(ItemStack book, @Nullable CommandSourceStack commandSource, @Nullable Player player) {
+         CompoundTag compoundTag = book.getTag();
+-        if (compoundTag != null && !compoundTag.getBoolean("resolved")) {
++        if (com.destroystokyo.paper.PaperConfig.resolveSelectorsInBooks && compoundTag != null && !compoundTag.getBoolean("resolved")) { // Paper
+             compoundTag.putBoolean("resolved", true);
+             if (!makeSureTagIsValid(compoundTag)) {
+                 return false;