diff --git a/app/assets/javascripts/discourse/routes/tags-index.js.es6 b/app/assets/javascripts/discourse/routes/tags-index.js.es6
index 7fbd3d529e..b6514ef278 100644
--- a/app/assets/javascripts/discourse/routes/tags-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/tags-index.js.es6
@@ -7,6 +7,13 @@ export default Discourse.Route.extend({
     return I18n.t("tagging.tags");
   },
 
+  setupController(controller, model) {
+    this.controllerFor('tags.index').setProperties({
+      model,
+      sortProperties: this.siteSettings.tags_sort_alphabetically ? ['id'] : ['count:desc', 'id']
+    });
+  },
+
   actions: {
     didTransition() {
       this.controllerFor("application").set("showFooter", true);