diff --git a/app/assets/javascripts/discourse/app/helpers/dir-span.js b/app/assets/javascripts/discourse/app/helpers/dir-span.js
index 022b2de52f6..83efafb63bb 100644
--- a/app/assets/javascripts/discourse/app/helpers/dir-span.js
+++ b/app/assets/javascripts/discourse/app/helpers/dir-span.js
@@ -1,6 +1,7 @@
 import { helperContext, registerUnbound } from "discourse-common/lib/helpers";
 import { htmlSafe } from "@ember/template";
 import { isRTL } from "discourse/lib/text-direction";
+import { escapeExpression } from "discourse/lib/utilities";
 
 function setDir(text) {
   let content = text ? text : "";
@@ -12,6 +13,7 @@ function setDir(text) {
   return content;
 }
 
-export default registerUnbound("dir-span", function (str) {
-  return htmlSafe(setDir(str));
+export default registerUnbound("dir-span", function (str, escapeText = true) {
+  let text = escapeText ? escapeExpression(str) : str;
+  return htmlSafe(setDir(text));
 });
diff --git a/app/assets/javascripts/discourse/app/models/category.js b/app/assets/javascripts/discourse/app/models/category.js
index 2fe8ea5ac1f..940bb5ba39e 100644
--- a/app/assets/javascripts/discourse/app/models/category.js
+++ b/app/assets/javascripts/discourse/app/models/category.js
@@ -8,7 +8,6 @@ import { ajax } from "discourse/lib/ajax";
 import { get } from "@ember/object";
 import { getOwner } from "discourse-common/lib/get-owner";
 import getURL from "discourse-common/lib/get-url";
-import { escapeExpression } from "discourse/lib/utilities";
 
 const STAFF_GROUP_NAME = "staff";
 
@@ -57,11 +56,6 @@ const Category = RestModel.extend({
     return { type: "category", id, category: this };
   },
 
-  @discourseComputed("name")
-  escapeName(name) {
-    return escapeExpression(name);
-  },
-
   @discourseComputed("parentCategory.ancestors")
   ancestors(parentAncestors) {
     return [...(parentAncestors || []), this];
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
index 3f7ad86de31..43cec199dc2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
@@ -4,7 +4,7 @@
     {{#if category.read_restricted}}
       {{d-icon lockIcon}}
     {{/if}}
-    <span class="category-name">{{dir-span category.escapeName}}</span>
+    <span class="category-name">{{dir-span category.name}}</span>
   </div>
   {{#if category.uploaded_logo.url}}
     {{cdn-img
diff --git a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
index dbf5cc2922b..b6145eb7ca9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
@@ -5,7 +5,7 @@
       {{category-title-link category=category}}
       {{#if category.description_excerpt}}
         <div class="category-description">
-          {{dir-span category.description_excerpt}}
+          {{dir-span category.description_excerpt false}}
         </div>
       {{/if}}
       {{#if category.isGrandParent}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
index 9d9817b4bb7..44c142d5695 100644
--- a/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
@@ -4,7 +4,7 @@
       {{category-title-link tagName="h4" category=category}}
       {{#if category.description_excerpt}}
         <div class="category-description subcategory-description">
-          {{dir-span category.description_excerpt}}
+          {{dir-span category.description_excerpt false}}
         </div>
       {{/if}}
       {{#if category.subcategories}}
diff --git a/app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr b/app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr
index df1e710062b..08d8256c27a 100644
--- a/app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr
+++ b/app/assets/javascripts/discourse/app/templates/list/topic-excerpt.hbr
@@ -1,6 +1,6 @@
 {{#if topic.hasExcerpt}}
   <a href="{{topic.url}}" class="topic-excerpt">
-    {{dir-span topic.escapedExcerpt}}
+    {{dir-span topic.escapedExcerpt false}}
     {{#if topic.excerptTruncated}}
       <span class="topic-excerpt-more">{{i18n 'read_more'}}</span>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
index 94b8df91aae..1de494920d8 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
@@ -11,7 +11,7 @@
     }}
 
     {{#if category.description}}
-      <p>{{dir-span category.description}}</p>
+      <p>{{dir-span category.description false}}</p>
     {{/if}}
   {{/if}}
 
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
index dfd630dffcb..77795727da7 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
@@ -9,7 +9,7 @@
   </div>
 
   {{#if shouldDisplayDescription}}
-    <div class="category-desc" aria-hidden="true">{{dir-span description}}</div>
+    <div class="category-desc" aria-hidden="true">{{dir-span description false}}</div>
   {{/if}}
 {{else}}
   {{html-safe label}}