diff --git a/app/assets/javascripts/discourse/app/models/composer.js b/app/assets/javascripts/discourse/app/models/composer.js
index e02f17cb64b..0f88c24218f 100644
--- a/app/assets/javascripts/discourse/app/models/composer.js
+++ b/app/assets/javascripts/discourse/app/models/composer.js
@@ -785,18 +785,16 @@ const Composer = RestModel.extend({
       });
     }
 
-    if (this.get("canEditTitle")) {
-      this.set("originalTitle", "");
-      this.set("title", "");
-    }
-
     if (opts.title) {
       this.set("title", opts.title);
     }
 
     this.set("originalText", opts.draft ? "" : this.reply);
 
-    if (this.editingFirstPost) {
+    if (this.canEditTitle) {
+      if (isEmpty(this.title) && this.title !== "") {
+        this.set("title", "");
+      }
       this.set("originalTitle", this.title);
     }