diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 9f43d1ace..e32b31017 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -152,6 +152,10 @@ class RepositoriesController < ApplicationController
 
       @tags = result.is_a?(Hash) && result.key?(:status) ? [] : result
     else
+      name_result = Gitea::Repository::Tags::ListNameService.call(@owner, @project.identifier, params[:name])
+
+      @tag_names = result.is_a?(Hash) && result.key?(:status) ? [] : name_result
+
       result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
 
       @tags = result.is_a?(Hash) && result.key?(:status) ? [] : result
diff --git a/app/views/repositories/tags.json.jbuilder b/app/views/repositories/tags.json.jbuilder
index b6fa1c491..4f5bb4330 100644
--- a/app/views/repositories/tags.json.jbuilder
+++ b/app/views/repositories/tags.json.jbuilder
@@ -1,4 +1,5 @@
-json.array! @tags do |tag|
+json.total_count @tag_names.present? ? @tag_names.count : @tags.count
+json.tags @tags do |tag|
   if tag.present? && tag.is_a?(Hash)
     json.name tag['name']
     json.id tag['id']