diff --git a/app/assets/javascripts/discourse/app/components/modal/tag-upload.hbs b/app/assets/javascripts/discourse/app/components/modal/tag-upload.hbs
new file mode 100644
index 00000000000..ea1d3c72d82
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/components/modal/tag-upload.hbs
@@ -0,0 +1,9 @@
+<DModal @title={{i18n "tagging.upload"}} @closeModal={{@closeModal}}>
+  <:body>
+    <TagsUploader
+      @refresh={{route-action "triggerRefresh"}}
+      @closeModal={{@closeModal}}
+      @id="tags-uploader"
+    />
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/controllers/tags-index.js b/app/assets/javascripts/discourse/app/controllers/tags-index.js
index 09d71e89c84..fe25351ac96 100644
--- a/app/assets/javascripts/discourse/app/controllers/tags-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/tags-index.js
@@ -5,12 +5,12 @@ import I18n from "I18n";
 import { ajax } from "discourse/lib/ajax";
 import discourseComputed from "discourse-common/utils/decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
-
 import { inject as service } from "@ember/service";
+import TagUpload from "discourse/components/modal/tag-upload";
 
 export default Controller.extend({
   dialog: service(),
+  modal: service(),
   sortedByCount: true,
   sortedByName: false,
   canAdminTags: alias("currentUser.staff"),
@@ -63,7 +63,7 @@ export default Controller.extend({
 
   actions: {
     showUploader() {
-      showModal("tag-upload");
+      this.modal.show(TagUpload);
     },
 
     deleteUnused() {
diff --git a/app/assets/javascripts/discourse/app/services/modal.js b/app/assets/javascripts/discourse/app/services/modal.js
index c68107a5ad3..8554f668a95 100644
--- a/app/assets/javascripts/discourse/app/services/modal.js
+++ b/app/assets/javascripts/discourse/app/services/modal.js
@@ -23,7 +23,6 @@ const KNOWN_LEGACY_MODALS = [
   "reject-reason-reviewable",
   "reorder-categories",
   "request-group-membership-form",
-  "tag-upload",
 ];
 
 const LEGACY_OPTS = new Set([
diff --git a/app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs b/app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs
deleted file mode 100644
index bf476814643..00000000000
--- a/app/assets/javascripts/discourse/app/templates/modal/tag-upload.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<DModalBody @title="tagging.upload">
-  <TagsUploader
-    @refresh={{route-action "triggerRefresh"}}
-    @closeModal={{route-action "closeModal"}}
-    @id="tags-uploader"
-  />
-</DModalBody>
\ No newline at end of file