diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b53bc01ef21..7d4d26a47c9 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -78,7 +78,7 @@
                                  defaultHeight="200"
                                  content=postStream.posts
                                  slackRatio="15"
-                                 loadingHTML=controller.loadingHTML
+                                 loadingHTML=""
                                  preservesContext="true"
                                  uncloakDefault="true"
                                  offsetFixedTop="header"
diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js
index b90c0113b6b..8c5cad2e362 100644
--- a/vendor/assets/javascripts/ember-cloaking.js
+++ b/vendor/assets/javascripts/ember-cloaking.js
@@ -201,8 +201,9 @@
       for (var j=bottomView; j<childViews.length; j++) {
         var checkView = childViews[j];
         if (!checkView._containedView) {
-          if (!checkView.get('loading')) {
-            checkView.$().html(this.get('loadingHTML'));
+          var loadingHTML = this.get('loadingHTML');
+          if (!Em.isEmpty(loadingHTML) && !checkView.get('loading')) {
+            checkView.$().html(loadingHTML);
           }
           return;
         }