diff --git a/client/components/MessageTypes/motd.vue b/client/components/MessageTypes/motd.vue
index 2e7a660d..2f23325d 100644
--- a/client/components/MessageTypes/motd.vue
+++ b/client/components/MessageTypes/motd.vue
@@ -26,7 +26,10 @@ export default {
 			}
 
 			// Remove empty lines around the MOTD (but not within it)
-			return lines.join("\n").trim();
+			return lines
+				.map((line) => line.trimEnd())
+				.join("\n")
+				.replace(/^[\r\n]+|[\r\n]+$/g, "");
 		},
 	},
 };