diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
index 5896a09d5db..136cca6d50a 100644
--- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6
+++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6
@@ -34,7 +34,7 @@ export default Mixin.create({
       topicBody,
       topicCategoryId,
       topicTags,
-      draftKey: controller.get("model.draft_key"),
+      draftKey: controller.get("model.draft_key") || Composer.NEW_TOPIC_KEY,
       draftSequence: controller.get("model.draft_sequence")
     });
   },