diff --git a/app/logical/post_query_builder.rb b/app/logical/post_query_builder.rb
index 1faee28f5..79b768dec 100644
--- a/app/logical/post_query_builder.rb
+++ b/app/logical/post_query_builder.rb
@@ -118,13 +118,9 @@ class PostQueryBuilder
 
   def metatags_match(metatags, relation)
     metatags.each do |metatag|
-      metatag_name = if metatag.negated && metatags_without_ord.key?(metatag.name)
-        metatags_without_ord[metatag.name]
-      else
-        metatag.name
-      end
+      metatag_name = metatags_without_ord[metatag.name] if metatag.negated && metatags_without_ord.key?(metatag.name)
 
-      clause = metatag_matches(metatag_name, metatag.value, quoted: metatag.quoted)
+      clause = metatag_matches(metatag_name || metatag.name, metatag.value, quoted: metatag.quoted)
       clause = clause.negate_relation if metatag.negated
       relation = relation.and_relation(clause)
     end