diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js
index 6b9eb6abf6..80345837a7 100644
--- a/app/assets/javascripts/discourse/controllers/topic_controller.js
+++ b/app/assets/javascripts/discourse/controllers/topic_controller.js
@@ -437,7 +437,7 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
     return canDelete;
   }.property('selectedPostsCount'),
 
-  hasError: Ember.computed.or('errorBodyHtml', 'message'),
+  hasError: Ember.computed.or('notFoundHtml', 'message'),
 
   multiSelectChanged: function() {
     // Deselect all posts when multi select is turned off
diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js
index e75f6df82b..d4223da2a8 100644
--- a/app/assets/javascripts/discourse/models/post_stream.js
+++ b/app/assets/javascripts/discourse/models/post_stream.js
@@ -827,7 +827,7 @@ Discourse.PostStream = Em.Object.extend({
     // If the result was 404 the post is not found
     if (status === 404) {
       topic.set('errorTitle', I18n.t('topic.not_found.title'));
-      topic.set('errorBodyHtml', result.responseText);
+      topic.set('notFoundHtml', result.responseText);
       return;
     }
 
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index 2f74f280f0..6949cab4db 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -119,12 +119,11 @@
 {{else}}
   {{#if hasError}}
     <div class='container'>
+    {{#if notFoundHtml}}
+      {{{notFoundHtml}}}
+    {{else}}
       <div class="topic-error">
-        {{{errorBodyHtml}}}
-
-        {{#if message}}
-          {{message}}
-        {{/if}}
+        {{message}}
         {{#if noRetry}}
           {{#unless currentUser}}
               <button {{action showLogin}} class='btn btn-primary topic-retry'><i class="fa fa-user"></i>{{i18n log_in}}</button>
@@ -136,6 +135,7 @@
       {{#if retrying}}
         <div class='spinner'>{{i18n loading}}</div>
       {{/if}}
+    {{/if}}
     </div>
   {{else}}
     <div class='container'>