diff --git a/web/app/[locale]/docs/backup-restore/glossary/page.tsx b/web/app/[locale]/docs/backup-restore/glossary/page.tsx
index bfb61cd8..2c247907 100644
--- a/web/app/[locale]/docs/backup-restore/glossary/page.tsx
+++ b/web/app/[locale]/docs/backup-restore/glossary/page.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next"
 import { getTranslations, getMessages, setRequestLocale } from "next-intl/server"
 import { Link } from "@/i18n/navigation"
+import { icuQuotesToHtml } from "@/i18n/loadMessages"
 import { DocHeader } from "@/components/ui/doc-header"
 
 export async function generateMetadata({
@@ -114,7 +115,7 @@ export default async function GlossaryPage({
                 </dt>
                 <dd
                   className="text-gray-800 leading-relaxed [&_a]:text-blue-600 [&_a]:hover:underline [&_code]:bg-gray-100 [&_code]:px-1 [&_code]:py-0.5 [&_code]:rounded [&_code]:text-sm"
-                  dangerouslySetInnerHTML={{ __html: entry.def }}
+                  dangerouslySetInnerHTML={{ __html: icuQuotesToHtml(entry.def) }}
                 />
               </div>
             ))}
diff --git a/web/app/[locale]/docs/monitor/dashboard/system-logs/page.tsx b/web/app/[locale]/docs/monitor/dashboard/system-logs/page.tsx
index 8fff6c70..8fc3479b 100644
--- a/web/app/[locale]/docs/monitor/dashboard/system-logs/page.tsx
+++ b/web/app/[locale]/docs/monitor/dashboard/system-logs/page.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from "next"
 import { getTranslations, getMessages, setRequestLocale } from "next-intl/server"
 import { Link } from "@/i18n/navigation"
+import { icuQuotesToHtml } from "@/i18n/loadMessages"
 import { DocHeader } from "@/components/ui/doc-header"
 import { Callout } from "@/components/ui/callout"
 import CopyableCode from "@/components/CopyableCode"
@@ -135,7 +136,7 @@ export default async function SystemLogsTabPage({
                 className={idx < dataRows.length - 1 ? "border-b border-gray-100" : ""}
               >
                 <td className="px-3 py-2 align-top">{row.subtab}</td>
-                <td className="px-3 py-2 align-top font-mono text-xs" dangerouslySetInnerHTML={{ __html: row.endpoint }} />
+                <td className="px-3 py-2 align-top font-mono text-xs" dangerouslySetInnerHTML={{ __html: icuQuotesToHtml(row.endpoint) }} />
                 <td className="px-3 py-2 align-top">
                   {t.rich(`dataCollected.rows.${idx}.source`, { code })}
                 </td>
diff --git a/web/i18n/loadMessages.ts b/web/i18n/loadMessages.ts
index f6d520e7..7c0e067e 100644
--- a/web/i18n/loadMessages.ts
+++ b/web/i18n/loadMessages.ts
@@ -73,6 +73,11 @@ function decodeEntities(value: unknown): unknown {
   return value
 }
 
+// Messages inserted as raw HTML skip ICU, so its quoting goes back to entities.
+export function icuQuotesToHtml(html: string): string {
+  return html.replace(/'<'/g, "&lt;").replace(/'>'/g, "&gt;")
+}
+
 function toCamel(name: string): string {
   return name.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase())
 }