diff --git a/lib/geocoder/lookups/esri.rb b/lib/geocoder/lookups/esri.rb
index 08523913533de7dd6e71fb480234807e3fef7e94..974ab07dd0245f14939579b5015759974b3cf970 100644
--- a/lib/geocoder/lookups/esri.rb
+++ b/lib/geocoder/lookups/esri.rb
@@ -58,7 +58,7 @@ module Geocoder::Lookup
 
     def fetch_and_save_token!
       token_instance = Geocoder::EsriToken.generate_token(*configuration.api_key)
-      Geocoder.configure(:esri => {:token => token_instance})
+      Geocoder.configure(:esri => Geocoder.config[:esri].merge({:token => token_instance}))
     end
   end
 end