diff --git a/core/src/main/java/org/geysermc/geyser/event/type/SessionDisconnectEventImpl.java b/core/src/main/java/org/geysermc/geyser/event/type/SessionDisconnectEventImpl.java
index c845b239976..b746979df9d 100644
--- a/core/src/main/java/org/geysermc/geyser/event/type/SessionDisconnectEventImpl.java
+++ b/core/src/main/java/org/geysermc/geyser/event/type/SessionDisconnectEventImpl.java
@@ -42,7 +42,7 @@ public class SessionDisconnectEventImpl extends SessionDisconnectEvent {
     private final Component reasonComponent;
 
     public SessionDisconnectEventImpl(@NonNull GeyserSession session, Component reason) {
-        super(session, MessageTranslator.convertMessageRaw(reason, session.locale()));
+        super(session, MessageTranslator.convertToPlainText(reason, session.locale()));
         this.reasonComponent = reason;
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
index 3b4546f2952..5604ad4aa52 100644
--- a/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
+++ b/core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
@@ -296,7 +296,7 @@ public BedrockPong onQuery(Channel channel, InetSocketAddress inetSocketAddress)
                 .serverId(channel.config().getOption(RakChannelOption.RAK_GUID));
 
         if (config.motd().passthroughMotd() && pingInfo != null && pingInfo.getDescription() != null) {
-            String[] motd = MessageTranslator.convertMessageLenient(pingInfo.getDescription()).split("\n");
+            String[] motd = MessageTranslator.convertToPlainTextLenient(pingInfo.getDescription(), GeyserLocale.getDefaultLocale()).split("\n");
             String mainMotd = (motd.length > 0) ? motd[0] : config.motd().primaryMotd(); // First line of the motd.
             String subMotd = (motd.length > 1) ? motd[1] : config.motd().secondaryMotd(); // Second line of the motd if present, otherwise default.