diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
index bd500049771..620decb81da 100644
--- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
@@ -101,8 +101,10 @@ export default Ember.Controller.extend({
     // defer load if needed, if in an expanded replies section
     if (!post) {
       const postStream = this.get('controllers.topic.model.postStream');
-      postStream.loadPost(postId).then(() => this.quoteText());
-      return;
+      return postStream.loadPost(postId).then(p => {
+        this.set('post', p);
+        return this.quoteText();
+      });
     }
 
     // If we can't create a post, delegate to reply as new topic
diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index 010330451b0..4ea6646f035 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -445,8 +445,7 @@ const PostStream = RestModel.extend({
     const url = "/posts/" + postId;
     const store = this.store;
 
-    return Discourse.ajax(url).then((p) =>
-        this.storePost(store.createRecord('post', p)));
+    return Discourse.ajax(url).then(p => this.storePost(store.createRecord('post', p)));
   },
 
   /**