diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 2f1adf877f2..d5cd37bb212 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -142,7 +142,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
 
       this.set('controllers.topic-progress.progressPosition', postStream.progressIndexOfPost(post));
 
-      if (lastLoadedPost && lastLoadedPost === post) {
+      if (lastLoadedPost && lastLoadedPost === post && postStream.get('canAppendMore')) {
         postStream.appendMore().then(() => refresh());
         // show loading stuff
         refresh();
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index 9a16dcf1e2f..e018f650dac 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -29,7 +29,7 @@ export default class PostCooked {
     this._fixImageSizes($html);
     this._applySearchHighlight($html);
 
-    // _decorators.forEach(cb => cb($html));
+    _decorators.forEach(cb => cb($html));
     return $html[0];
   }