diff --git a/src/components/markdown/RemarkRenderer.tsx b/src/components/markdown/RemarkRenderer.tsx
index 02ac472a..3a729e35 100644
--- a/src/components/markdown/RemarkRenderer.tsx
+++ b/src/components/markdown/RemarkRenderer.tsx
@@ -20,6 +20,7 @@ import { RenderCodeblock } from "./plugins/Codeblock";
 import { RenderAnchor } from "./plugins/anchors";
 import { remarkChannels, RenderChannel } from "./plugins/channels";
 import { isOnlyEmoji, remarkEmoji, RenderEmoji } from "./plugins/emoji";
+import { remarkHtmlEntities } from "./plugins/htmlEntities";
 import { remarkMention, RenderMention } from "./plugins/mentions";
 import { remarkSpoiler, RenderSpoiler } from "./plugins/spoiler";
 import { remarkTimestamps } from "./plugins/timestamps";
@@ -138,6 +139,7 @@ const render = unified()
     .use(remarkTimestamps)
     .use(remarkEmoji)
     .use(remarkMention)
+    .use(remarkHtmlEntities)
     .use(remarkRehype, {
         handlers,
     })
@@ -197,10 +199,6 @@ function sanitise(content: string) {
         content
             // Strip excessive blockquote indentation
             .replace(RE_QUOTE, (_, m0, m1) => m0 + m1)
-            // Map < to HTML entity LT
-            // (otherwise all HTML is just obliterated,
-            // not even displayed as plain text)
-            .replace(RE_OPEN_BRACKET, "&lt;")
     );
 }
 
diff --git a/src/components/markdown/plugins/htmlEntities.ts b/src/components/markdown/plugins/htmlEntities.ts
new file mode 100644
index 00000000..eae15f49
--- /dev/null
+++ b/src/components/markdown/plugins/htmlEntities.ts
@@ -0,0 +1,10 @@
+import { Plugin } from "unified";
+import { visit } from "unist-util-visit";
+
+export const remarkHtmlEntities: Plugin = () => {
+    return (tree) => {
+        visit(tree, "text", (node: { value: string }) => {
+            node.value = node.value.replace(/</g, "&lt;");
+        });
+    };
+};