diff --git a/app/logical/related_tag_calculator.rb b/app/logical/related_tag_calculator.rb
index 5e05ccd58..d702dad37 100644
--- a/app/logical/related_tag_calculator.rb
+++ b/app/logical/related_tag_calculator.rb
@@ -1,6 +1,6 @@
 class RelatedTagCalculator
   def self.find_tags(tag, limit)
-    Post.with_timeout(10_000, []) do
+    Post.with_timeout(5_000, []) do
       Post.tag_match(tag).limit(limit).select("posts.tag_string").reorder("posts.md5").map(&:tag_string)
     end
   end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index db176a746..303da5df8 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -404,6 +404,7 @@ class Tag < ActiveRecord::Base
       end
       self.related_tags_updated_at = Time.now
       save
+    rescue ActiveRecord::StatementInvalid
     end
 
     def update_related_if_outdated