diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb
index ac852c0886..503fd736ba 100644
--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -59,7 +59,7 @@ module Admin
     def build_resource_with_address
       enterprise = build_resource_without_address
       enterprise.address = Spree::Address.new
-      enterprise.address.country = Spree::Country.find_by_name(ENV['DEFAULT_COUNTRY'])
+      enterprise.address.country = Spree::Country.find_by_id(Spree::Config[:default_country_id])
       enterprise
     end
     alias_method_chain :build_resource, :address