diff --git a/patches/server/Fix-text-display-error-on-spawn.patch b/patches/server/Fix-text-display-error-on-spawn.patch
new file mode 100644
index 0000000000..a377bb8369
--- /dev/null
+++ b/patches/server/Fix-text-display-error-on-spawn.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Thu, 16 Mar 2023 16:27:50 +0100
+Subject: [PATCH] Fix text display error on spawn
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/Display.java
++++ b/src/main/java/net/minecraft/world/entity/Display.java
+@@ -0,0 +0,0 @@ public abstract class Display extends Entity {
+             byte b = loadFlag((byte)0, nbt, "shadow", (byte)1);
+             b = loadFlag(b, nbt, "see_through", (byte)2);
+             b = loadFlag(b, nbt, "default_background", (byte)4);
+-            Optional<Display.TextDisplay.Align> optional = Display.TextDisplay.Align.CODEC.decode(NbtOps.INSTANCE, nbt.get("alignment")).resultOrPartial(Util.prefix("Display entity", Display.LOGGER::error)).map(Pair::getFirst);
++            Optional<Display.TextDisplay.Align> optional = Display.TextDisplay.Align.CODEC.decode(NbtOps.INSTANCE, nbt.get("alignment")).result().map(Pair::getFirst); // Paper
+             if (optional.isPresent()) {
+                 byte var10000;
+                 switch ((Display.TextDisplay.Align)optional.get()) {