lib/searchkick.rb in searchkick-4.0.0 vs lib/searchkick.rb in searchkick-4.0.1

@@ -65,10 +65,10 @@
   def self.env
     @env ||= ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
   end
 
   def self.search_timeout
-    @search_timeout || timeout
+    (defined?(@search_timeout) && @search_timeout) || timeout
   end
 
   def self.server_version
     @server_version ||= client.info["version"]["number"]
   end