diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
index d0b8b45009a..dfc7cf51802 100644
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6
@@ -42,7 +42,7 @@ export default Combobox.extend({
 
   @computed("rootNone", "rootNoneLabel")
   none(rootNone, rootNoneLabel) {
-    if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
+    if (this.siteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
       if (rootNone) {
         return rootNoneLabel || "category.none";
       } else {
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
index 34f1b9cf66d..c04c3524e1d 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -70,7 +70,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       time,
       this.get('topicTimer.based_on_last_post'),
       statusType,
-      this.get('categoryId')
+      this.get('topicTimer.category_id')
     ).then(result => {
       if (time) {
         this.send('closeModal');
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 8668ba43a1b..6a1b4c24bee 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -13,13 +13,16 @@
       {{else if publishToCategory}}
         <div class="control-group">
           <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
-          {{category-chooser valueAttribute="id" value=categoryId excludeCategoryId=excludeCategoryId}}
+          {{category-chooser
+              valueAttribute="id"
+              value=topicTimer.category_id
+              excludeCategoryId=excludeCategoryId}}
         </div>
 
         {{auto-update-input
             input=updateTime
             statusType=selection
-            categoryId=categoryId
+            categoryId=topicTimer.category_id
             basedOnLastPost=false}}
       {{else if autoClose}}
         {{auto-update-input