diff --git a/core/db/default/spree/countries.rb b/core/db/default/spree/countries.rb
index c33b4ec850b..31e29f5b728 100644
--- a/core/db/default/spree/countries.rb
+++ b/core/db/default/spree/countries.rb
@@ -1,17 +1,13 @@
 require 'carmen'
 
-countries = []
-Carmen::Country.all.each do |country|
-  countries << {
-    name: country.name,
-    iso3: country.alpha_3_code,
-    iso: country.alpha_2_code,
-    iso_name: country.name.upcase,
-    numcode: country.numeric_code,
-    states_required: country.subregions?
-  }
-end
-
 ActiveRecord::Base.transaction do
-  Spree::Country.create!(countries)
+  Carmen::Country.all.each do |country|
+    Spree::Country.where(iso: country.alpha_2_code).first_or_create!(
+      name: country.name,
+      iso3: country.alpha_3_code,
+      iso_name: country.name.upcase,
+      numcode: country.numeric_code,
+      states_required: country.subregions?
+    )
+  end
 end
diff --git a/core/db/default/spree/states.rb b/core/db/default/spree/states.rb
index 178207582cc..6875cefd98e 100644
--- a/core/db/default/spree/states.rb
+++ b/core/db/default/spree/states.rb
@@ -1,15 +1,12 @@
 ActiveRecord::Base.transaction do
   Spree::Country.all.each do |country|
-    carmen_country = Carmen::Country.named(country.name)
-    @states ||= []
+    carmen_country = Carmen::Country.coded(country.iso)
     next unless carmen_country.subregions?
+
     carmen_country.subregions.each do |subregion|
-      @states << {
-        name: subregion.name,
-        abbr: subregion.code,
-        country: country
-      }
+      Spree::State.where(abbr: subregion.code, country: country).first_or_create!(
+        name: subregion.name
+      )
     end
   end
-  Spree::State.create!(@states)
 end