diff --git a/app/controllers/issue_tags_controller.rb b/app/controllers/issue_tags_controller.rb
index 011735ff7..da9f16f71 100644
--- a/app/controllers/issue_tags_controller.rb
+++ b/app/controllers/issue_tags_controller.rb
@@ -7,7 +7,7 @@ class IssueTagsController < ApplicationController
 
 
   def index
-    issue_tags = @project.issue_tags.reorder("#{order_name} #{order_type}")
+    issue_tags = @project.issue_tags.includes(:issues).reorder("issue_tags.#{order_name} #{order_type}")
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
     @page  = params[:page]  || 1
     @limit = params[:limit] || 15
diff --git a/app/views/issue_tags/index.json.jbuilder b/app/views/issue_tags/index.json.jbuilder
index 7f20a4374..37bd51608 100644
--- a/app/views/issue_tags/index.json.jbuilder
+++ b/app/views/issue_tags/index.json.jbuilder
@@ -4,6 +4,7 @@ json.user_admin_or_member @user_admin_or_member
 json.issue_tags do
 
   json.array! @issue_tags.each.to_a do |tag|
-    json.extract! tag, :id, :name, :description, :color, :issues_count, :project_id, :gid, :gitea_url
+    json.extract! tag, :id, :name, :description, :color, :project_id, :gid, :gitea_url
+    json.issues_count tag.issues_count - tag.issues.closed.size
   end
 end
\ No newline at end of file