diff --git a/lib/capybara/node/matchers.rb b/lib/capybara/node/matchers.rb
index aa15c4f5..5392d643 100644
--- a/lib/capybara/node/matchers.rb
+++ b/lib/capybara/node/matchers.rb
@@ -112,7 +112,8 @@ module Capybara
       #
       # @overload assert_all_of_selectors([kind = Capybara.default_selector], *locators, options = {})
       #
-      def assert_all_of_selectors(*args, wait: session_options.default_max_wait_time, **options, &optional_filter_block)
+      def assert_all_of_selectors(*args, wait: nil, **options, &optional_filter_block)
+        wait = session_options.default_max_wait_time if wait.nil?
         selector = args.first.is_a?(Symbol) ? args.shift : session_options.default_selector
         synchronize(wait) do
           args.each do |locator|
@@ -136,7 +137,8 @@ module Capybara
       #
       # @overload assert_none_of_selectors([kind = Capybara.default_selector], *locators, options = {})
       #
-      def assert_none_of_selectors(*args, wait: session_options.default_max_wait_time, **options, &optional_filter_block)
+      def assert_none_of_selectors(*args, wait: nil, **options, &optional_filter_block)
+        wait = session_options.default_max_wait_time if wait.nil?
         selector = args.first.is_a?(Symbol) ? args.shift : session_options.default_selector
         synchronize(wait) do
           args.each do |locator|
diff --git a/lib/capybara/queries/base_query.rb b/lib/capybara/queries/base_query.rb
index 0d36a479..3757c32f 100644
--- a/lib/capybara/queries/base_query.rb
+++ b/lib/capybara/queries/base_query.rb
@@ -22,7 +22,10 @@ module Capybara
       end
 
       def self.wait(options, default = Capybara.default_max_wait_time)
-        options.fetch(:wait, default) || 0
+        # if no value or nil for the :wait option is passed it should default to the default
+        w = options.fetch(:wait, nil)
+        w = default if w.nil?
+        w || 0
       end
 
       ##