diff --git a/resources/js/beatmapsets-show/controller.ts b/resources/js/beatmapsets-show/controller.ts
index 542d6c251b8..05e784e6349 100644
--- a/resources/js/beatmapsets-show/controller.ts
+++ b/resources/js/beatmapsets-show/controller.ts
@@ -76,15 +76,15 @@ export default class Controller {
   get tags() {
     const mapperTagSet = new Set(this.beatmapset.tags.split(' ').filter(present));
 
-    const userTags: Partial<Record<number, TagJsonWithCount>> = {};
+    const tags: Partial<Record<number, TagJsonWithCount>> = {};
     for (const beatmap of this.beatmapset.beatmaps) {
       if (beatmap.tags == null) continue;
 
       for (const tag of beatmap.tags) {
-        let summedTag = userTags[tag.id];
+        let summedTag = tags[tag.id];
         if (summedTag == null) {
           summedTag = toJS(tag); // don't modify original
-          userTags[tag.id] = summedTag;
+          tags[tag.id] = summedTag;
         } else {
           summedTag.count += tag.count;
         }
@@ -99,7 +99,11 @@ export default class Controller {
 
     return {
       mapperTags: [...mapperTagSet.values()],
-      userTags,
+      userTags: Object.values(tags).sort((a, b) => {
+        if (a == null || b == null) return 0; // for typing only, doesn't contain nulls.
+        const diff = b.count - a.count;
+        return diff !== 0 ? diff : a.id - b.id;
+      }),
     };
   }
 
diff --git a/resources/js/beatmapsets-show/info.tsx b/resources/js/beatmapsets-show/info.tsx
index a9c539039ed..56cbe3641fc 100644
--- a/resources/js/beatmapsets-show/info.tsx
+++ b/resources/js/beatmapsets-show/info.tsx
@@ -68,14 +68,8 @@ export default class Info extends React.Component<Props> {
   private get tags() {
     const tags = this.controller.tags;
 
-    const sortedUserTags = Object.values(tags.userTags).sort((a, b) => {
-      if (a == null || b == null) return 0; // for typing only, doesn't contain nulls.
-      const diff = b.count - a.count;
-      return diff !== 0 ? diff : a.id - b.id;
-    });
-
     return [
-      ...sortedUserTags.map((tag) => tag?.name),
+      ...tags.userTags.map((tag) => tag?.name),
       ...tags.mapperTags,
     ];
   }