diff --git a/Spigot-Server-Patches/Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/Implement-extended-PaperServerListPingEvent.patch
index 0da983877..cfb600ded 100644
--- a/Spigot-Server-Patches/Implement-extended-PaperServerListPingEvent.patch
+++ b/Spigot-Server-Patches/Implement-extended-PaperServerListPingEvent.patch
@@ -71,11 +71,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import com.google.common.base.MoreObjects;
 +import com.google.common.base.Strings;
 +import com.mojang.authlib.GameProfile;
-+import net.minecraft.server.ChatComponentText;
 +import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.NetworkManager;
 +import net.minecraft.server.PacketStatusOutServerInfo;
 +import net.minecraft.server.ServerPing;
++import org.bukkit.craftbukkit.util.CraftChatMessage;
 +
 +import java.util.List;
 +import java.util.UUID;
@@ -155,7 +155,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        ServerPing ping = new ServerPing();
 +
 +        // Description
-+        ping.setMOTD(new ChatComponentText(event.getMotd()));
++        ping.setMOTD(CraftChatMessage.fromString(event.getMotd())[0]);
 +
 +        // Players
 +        if (!event.shouldHidePlayers()) {