diff --git a/app/helpers/tag_chosen_helper.rb b/app/helpers/tag_chosen_helper.rb
index 4ded66e1a..dcf3c457c 100644
--- a/app/helpers/tag_chosen_helper.rb
+++ b/app/helpers/tag_chosen_helper.rb
@@ -29,8 +29,9 @@ module TagChosenHelper
     if project.educoder?
       return ['master']
     else
-      branches = Gitea::Repository::Branches::ListService.call(project&.owner, project.identifier)
-      branches.collect{|i| i["name"] if i.is_a?(Hash)}
+      branches = Gitea::Repository::Branches::ListNameService.call(project&.owner, project.identifier)
+      return branches.collect{|i| i["name"] if i.is_a?(Hash)} if branches.is_a?(Array)
+      return branches["branch_name"] if branches.is_a?(Hash)
     end
   end
 
diff --git a/app/services/gitea/repository/branches/list_name_service.rb b/app/services/gitea/repository/branches/list_name_service.rb
new file mode 100644
index 000000000..716ee464c
--- /dev/null
+++ b/app/services/gitea/repository/branches/list_name_service.rb
@@ -0,0 +1,22 @@
+class Gitea::Repository::Branches::ListNameService < Gitea::ClientService
+  attr_reader :user, :repo
+
+  def initialize(user, repo)
+    @user = user
+    @repo = repo
+  end
+
+  def call
+    response = get(url, params)
+    render_200_response(response)
+  end
+
+  private
+  def params
+    Hash.new.merge(token: user.gitea_token)
+  end
+
+  def url
+    "/repos/#{user.login}/#{repo}/branch_name_set".freeze
+  end
+end