diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index aaa4e49eb42f1fce6aff49b6523b256973a9d414..5155ae1b10410898f729ae2a2cb351c730f6a9e8 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -253,15 +253,19 @@ class ProjectsController < Projects::ApplicationController
 
   def refs
     repository = @project.repository
+    tags = VersionSorter.rsort(repository.tag_names)
 
     options = {
       'Branches' => repository.branch_names,
-      'Tags' => VersionSorter.rsort(repository.tag_names)
     }
 
+    if tags.any?
+      options['Tags'] = tags
+    end
+
     # If reference is commit id - we should add it to branch/tag selectbox
     if @ref && !options.flatten.include?(@ref) && @ref =~ /\A[0-9a-zA-Z]{6,52}\z/
-      options << { 'Commits' => @ref }
+      options['Commits'] = @ref
     end
 
     render json: options.to_json