diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 50149da0c..4f1e20bfc 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -100,7 +100,7 @@ protected
   def save_recent_tags
     if @upload
       tags = Tag.scan_tags(@upload.tag_string)
-      tags = (TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])).uniq.slice(0, 30)
+      tags = (TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])).compact.uniq.slice(0, 30)
       cookies[:recent_tags] = tags.join(" ")
       cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
     end