diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs
index 67f4a2a87fd..9b404b99293 100644
--- a/app/assets/javascripts/admin/templates/flags-list.hbs
+++ b/app/assets/javascripts/admin/templates/flags-list.hbs
@@ -32,7 +32,7 @@
{{fa-icon "envelope"}}
{{/if}}
{{topic-status topic=flaggedPost.topic}}
- {{{flaggedPost.topic.fancyTitle}}}
+ {{{unbound flaggedPost.topic.fancyTitle}}}
{{#if flaggedPost.postAuthorFlagged}}
{{{flaggedPost.excerpt}}}
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 2c14d86bebf..157af104dd4 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -10,6 +10,7 @@ const Topic = RestModel.extend({
@computed('fancy_title')
fancyTitle(title) {
+ title = title || "";
title = Discourse.Emoji.unescape(title);
return Discourse.CensoredWords.censor(title);
},
diff --git a/app/serializers/flagged_topic_serializer.rb b/app/serializers/flagged_topic_serializer.rb
index 2e5e08b0866..bf6bcf4df01 100644
--- a/app/serializers/flagged_topic_serializer.rb
+++ b/app/serializers/flagged_topic_serializer.rb
@@ -1,6 +1,7 @@
class FlaggedTopicSerializer < ActiveModel::Serializer
attributes :id,
:title,
+ :fancy_title,
:slug,
:archived,
:closed,