diff --git a/app/assets/javascripts/discourse/components/count-i18n.js.es6 b/app/assets/javascripts/discourse/components/count-i18n.js.es6
index 9bdb715dc5d..d0fd9bdccbe 100644
--- a/app/assets/javascripts/discourse/components/count-i18n.js.es6
+++ b/app/assets/javascripts/discourse/components/count-i18n.js.es6
@@ -1,17 +1,15 @@
 import Component from "@ember/component";
-import { bufferedRender } from "discourse-common/lib/buffered-render";
 
-export default Component.extend(
-  bufferedRender({
-    tagName: "span",
-    rerenderTriggers: ["count", "suffix"],
+export default Component.extend({
+  tagName: "span",
+  rerenderTriggers: ["count", "suffix"],
+  i18nCount: null,
 
-    buildBuffer(buffer) {
-      buffer.push(
-        I18n.t(this.key + (this.suffix || ""), {
-          count: this.count
-        })
-      );
-    }
-  })
-);
+  didReceiveAttrs() {
+    this._super(...arguments);
+    this.set(
+      "i18nCount",
+      I18n.t(this.key + (this.suffix || ""), { count: this.count }).htmlSafe()
+    );
+  }
+});
diff --git a/app/assets/javascripts/discourse/templates/components/count-i18n.hbs b/app/assets/javascripts/discourse/templates/components/count-i18n.hbs
new file mode 100644
index 00000000000..f7a5927a07a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/count-i18n.hbs
@@ -0,0 +1 @@
+{{i18nCount}}