diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index d919bf98b..4843f3b96 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -18,7 +18,7 @@ class TagsController < ApplicationController
       # limit rollout
       @tags = TagAutocomplete.search(params[:search][:name_matches])
     else
-      @tags = Tag.names_matches_with_aliases(params[:search][:name_matches], limit: params[:limit])
+      @tags = Tag.names_matches_with_aliases(params[:search][:name_matches], params.fetch(:limit, 10).to_i)
     end
 
     # XXX