diff --git a/lib/capybara/queries/selector_query.rb b/lib/capybara/queries/selector_query.rb
index d1f9edcd..5870ab7d 100644
--- a/lib/capybara/queries/selector_query.rb
+++ b/lib/capybara/queries/selector_query.rb
@@ -307,7 +307,7 @@ module Capybara
       end
 
       def matches_locator_filter?(node)
-        return true if @selector.locator_filter.nil?
+        return true unless @selector.locator_filter
 
         @selector.locator_filter.matches?(node, @locator, @selector)
       end
diff --git a/lib/capybara/selector/filters/locator_filter.rb b/lib/capybara/selector/filters/locator_filter.rb
index 03bc1992..a63ff8fc 100644
--- a/lib/capybara/selector/filters/locator_filter.rb
+++ b/lib/capybara/selector/filters/locator_filter.rb
@@ -11,9 +11,7 @@ module Capybara
         end
 
         def matches?(node, value, context = nil)
-          apply(node, nil, value, true, context)
-        rescue Capybara::ElementNotFound
-          false
+          super(node, nil, value, context)
         end
       end
     end