diff --git a/web/src/filter.ts b/web/src/filter.ts
index 80a921f87b..c6ba52c515 100644
--- a/web/src/filter.ts
+++ b/web/src/filter.ts
@@ -23,7 +23,8 @@ import * as user_topics from "./user_topics.ts";
 import * as util from "./util.ts";
 
 type IconData = {
-    title: string;
+    title?: string | undefined;
+    html_title?: string | undefined;
     is_spectator: boolean;
 } & (
     | {
@@ -1317,7 +1318,8 @@ export class Filter {
     }
 
     add_icon_data(context: {
-        title: string;
+        title?: string;
+        html_title?: string;
         description?: string | undefined;
         link?: string | undefined;
         is_spectator: boolean;
diff --git a/web/src/message_view_header.ts b/web/src/message_view_header.ts
index 1cf488abd5..3efb10bc69 100644
--- a/web/src/message_view_header.ts
+++ b/web/src/message_view_header.ts
@@ -18,7 +18,8 @@ import * as stream_data from "./stream_data.ts";
 import type {StreamSubscription} from "./sub_store.ts";
 
 type MessageViewHeaderContext = {
-    title: string;
+    title?: string | undefined;
+    html_title?: string | undefined;
     description?: string;
     link?: string;
     is_spectator?: boolean;
diff --git a/web/templates/navbar_icon_and_title.hbs b/web/templates/navbar_icon_and_title.hbs
index 3f1ba27085..632c2d709c 100644
--- a/web/templates/navbar_icon_and_title.hbs
+++ b/web/templates/navbar_icon_and_title.hbs
@@ -3,7 +3,12 @@
 {{else if icon}}
 <i class="navbar-icon fa fa-{{icon}}" aria-hidden="true"></i>
 {{/if}}
+{{#if title}}
 <span class="message-header-navbar-title">{{title}}</span>
+{{/if}}
+{{#if html_title}}
+<span class="message-header-navbar-title">{{{html_title}}}</span>
+{{/if}}
 {{#if stream}}
     {{#if stream.is_archived}}
     <span class="message-header-archived">