diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index 85c69ad880c..c74a640eac5 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -831,22 +831,13 @@ const Composer = RestModel.extend({
       this.setProperties(topicProps);
 
       promise = promise.then(() => {
-        let rawPromise = Promise.resolve();
-
-        if (!this.post.raw) {
-          rawPromise = this.store.find("post", opts.post.id).then((post) => {
-            this.setProperties({
-              post,
-              reply: post.raw,
-              originalText: post.raw,
-            });
-          });
-        } else {
+        let rawPromise = this.store.find("post", opts.post.id).then((post) => {
           this.setProperties({
-            reply: this.post.raw,
-            originalText: this.post.raw,
+            post,
+            reply: post.raw,
+            originalText: post.raw,
           });
-        }
+        });
 
         // edge case ... make a post then edit right away
         // store does not have topic for the post