diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
index 3f43ac5cad3..678f2938eae 100644
--- a/config/initializers/geocoder.rb
+++ b/config/initializers/geocoder.rb
@@ -11,18 +11,19 @@ def language=(_locale); end
 
 GEO_DATA_FILEPATH = Rails.root.join(IdentityConfig.store.geo_data_file_path).freeze
 
-if !Rails.env.production? && !File.exist?(GEO_DATA_FILEPATH)
-  Geocoder.configure(ip_lookup: :test)
-  Geocoder::Lookup::Test.set_default_stub(
-    [
-      { 'city' => '', 'country' => 'United States', 'state_code' => '' },
-    ],
-  )
-else
+if Rails.env.production? && File.exist?(GEO_DATA_FILEPATH)
   Geocoder.configure(
     ip_lookup: :geoip2,
     geoip2: {
       file: GEO_DATA_FILEPATH,
     },
   )
+  Geocoder.search('1.2.3.4') # the datasource is lazily loaded, make sure it eager loads
+else
+  Geocoder.configure(ip_lookup: :test)
+  Geocoder::Lookup::Test.set_default_stub(
+    [
+      { 'city' => '', 'country' => 'United States', 'state_code' => '' },
+    ],
+  )
 end