diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 88d99fa3bbc..2c14d86bebf 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -2,14 +2,17 @@ import { flushMap } from 'discourse/models/store';
 import RestModel from 'discourse/models/rest';
 import { propertyEqual } from 'discourse/lib/computed';
 import { longDate } from 'discourse/lib/formatter';
+import computed from 'ember-addons/ember-computed-decorators';
 
 const Topic = RestModel.extend({
   message: null,
   errorLoading: false,
 
-  fancyTitle: function() {
-    return Discourse.Emoji.unescape(this.get('fancy_title'));
-  }.property("fancy_title"),
+  @computed('fancy_title')
+  fancyTitle(title) {
+    title = Discourse.Emoji.unescape(title);
+    return Discourse.CensoredWords.censor(title);
+  },
 
   // returns createdAt if there's no bumped date
   bumpedAt: function() {