diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index c42122d5f8b..b7615c13185 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -13,6 +13,7 @@ export default Controller.extend({
   modal: service(),
   sortedByCount: true,
   sortedByName: false,
+  sortAlphabetically: alias("siteSettings.tags_sort_alphabetically"),
   canAdminTags: alias("currentUser.staff"),
   groupedByCategory: notEmpty("model.extras.categories"),
   groupedByTagGroup: notEmpty("model.extras.tag_groups"),
@@ -20,7 +21,13 @@ export default Controller.extend({
   init() {
     this._super(...arguments);
 
-    this.sortProperties = ["totalCount:desc", "id"];
+    const isAlphaSort = this.sortAlphabetically;
+
+    this.setProperties({
+      sortedByCount: isAlphaSort ? false : true,
+      sortedByName: isAlphaSort ? true : false,
+      sortProperties: isAlphaSort ? ["id"] : ["totalCount:desc", "id"],
+    });
   },
 
   @discourseComputed("groupedByCategory", "groupedByTagGroup")