diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index 07c872f838..203cc6f321 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -82,6 +82,7 @@
                                  slackRatio=slackRatio
                                  loadingHTML=controller.loadingHTML
                                  preservesContext="true"
+                                 uncloakDefault="true"
                                  offsetFixed="header"}}
           {{/unless}}
 
diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js
index 37e637f5c8..b76488c9a2 100644
--- a/vendor/assets/javascripts/ember-cloaking.js
+++ b/vendor/assets/javascripts/ember-cloaking.js
@@ -14,7 +14,8 @@
 
     init: function() {
       var cloakView = this.get('cloakView'),
-          idProperty = this.get('idProperty');
+          idProperty = this.get('idProperty'),
+          uncloakDefault = !!this.get('uncloakDefault');
 
       // Set the slack ratio differently to allow for more or less slack in preloading
       var slackRatio = parseFloat(this.get('slackRatio'));
@@ -33,6 +34,11 @@
           if (idProperty) {
             this.set('elementId', cloakView + '-cloak-' + this.get('content.' + idProperty));
           }
+          if (uncloakDefault) {
+            this.uncloak();
+          } else {
+            this.cloak();
+          }
         }
       }));
 
@@ -219,11 +225,6 @@
   Ember.CloakedView = Ember.View.extend({
     attributeBindings: ['style'],
 
-    init: function() {
-      this._super();
-      this.cloak();
-    },
-
     /**
       Triggers the set up for rendering a view that is cloaked.