diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 461fd9ba0..efe5d7cdb 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -19,7 +19,7 @@ class TagsController < ApplicationController
 
   def autocomplete
     @tags = Tag.names_matches_with_aliases(params[:search][:name_matches])
-    expires_in 7.days
+    expires_in params[:expiry].to_i.days if params[:expiry]
 
     respond_with(@tags) do |format|
       format.xml do