diff --git a/elasticsearch-api/Gemfile b/elasticsearch-api/Gemfile
index d65c401d73..6f2646fa20 100644
--- a/elasticsearch-api/Gemfile
+++ b/elasticsearch-api/Gemfile
@@ -20,8 +20,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-api.gemspec
 gemspec
 
-if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __dir__)
-  gem 'elasticsearch', path: File.expand_path('../../elasticsearch', __dir__), require: false
+if File.exist? File.expand_path('../elasticsearch/elasticsearch.gemspec', __dir__)
+  gem 'elasticsearch', path: File.expand_path('../elasticsearch', __dir__), require: false
 end
 
 group :development do
diff --git a/elasticsearch/lib/elasticsearch.rb b/elasticsearch/lib/elasticsearch.rb
index 6b1639f383..5fb6750931 100644
--- a/elasticsearch/lib/elasticsearch.rb
+++ b/elasticsearch/lib/elasticsearch.rb
@@ -160,6 +160,7 @@ def elasticsearch_validation_request
 
     def sent_user_agent?(arguments)
       return unless (headers = arguments&.[](:transport_options)&.[](:headers))
+
       !!headers.keys.detect { |h| h =~ /user-?_?agent/ }
     end