diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index d43ed31e7..a9f10b115 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -156,7 +156,8 @@ class ConversationFinder
   def filter_by_labels
     return unless params[:labels]
 
-    @conversations = @conversations.tagged_with(params[:labels], any: true)
+    pattern = params[:labels].map { |label| Regexp.escape(label) }.join('|')
+    @conversations = @conversations.where('cached_label_list ~ ?', "\\y(#{pattern})\\y")
   end
 
   def filter_by_source_id