diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 7d5a17a8ce..87bc40c123 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -392,13 +392,18 @@ Discourse.Composer = Discourse.Model.extend({
     // Update the title if we've changed it
     if (this.get('title') && post.get('post_number') === 1) {
       var topic = this.get('topic');
-      var category = Discourse.Category.list().findProperty('name', this.get('categoryName'));
       topic.setProperties({
         title: this.get('title'),
-        fancy_title: this.get('title'),
-        categoryName: category.get('name'),
-        category_id: category.get('id')
+        fancy_title: this.get('title')
       });
+
+      var category = Discourse.Category.list().findProperty('name', this.get('categoryName'));
+      if (category) {
+        topic.setProperties({
+          categoryName: category.get('name'),
+          category_id: category.get('id')
+        });
+      }
       topic.save();
     }