diff --git a/Gemfile b/Gemfile
index 301ff1a6..cf878fe0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -137,7 +137,7 @@ gem 'leaflet-rails'
 gem 'gravtastic'
 
 # for country selects
-gem 'country_select'
+gem 'i18n_data'
 
 # as PDF generator
 gem 'prawn-qrcode'
diff --git a/Gemfile.lock b/Gemfile.lock
index bd04e54e..b7998a3a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,12 +170,6 @@ GEM
     concurrent-ruby (1.2.2)
     countable-rails (0.0.1)
       railties (>= 3.1)
-    countries (5.0.2)
-      i18n_data (~> 0.16.0)
-      sixarm_ruby_unaccent (~> 1.1)
-    country_select (7.0.0)
-      countries (~> 5.0)
-      sort_alphabetical (~> 1.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -256,7 +250,7 @@ GEM
       domain_name (~> 0.5)
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.16.0)
+    i18n_data (0.17.1)
       simple_po_parser (~> 1.1)
     icalendar (2.8.0)
       ice_cube (~> 0.16)
@@ -552,14 +546,11 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sixarm_ruby_unaccent (1.2.0)
     skylight (5.3.4)
       activesupport (>= 5.2.0)
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    sort_alphabetical (1.1.0)
-      unicode_utils (>= 1.2.2)
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -594,7 +585,6 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
-    unicode_utils (1.4.0)
     unobtrusive_flash (3.3.1)
       railties
     version_gem (1.1.2)
@@ -647,7 +637,6 @@ DEPENDENCIES
   cloudinary
   cocoon
   countable-rails
-  country_select
   daemons
   dalli
   database_cleaner
@@ -663,6 +652,7 @@ DEPENDENCIES
   gravtastic
   haml-rails
   haml_lint
+  i18n_data
   icalendar
   iso-639
   jquery-datatables-rails
diff --git a/app/models/venue.rb b/app/models/venue.rb
index 5df7c60e..0064b5c4 100644
--- a/app/models/venue.rb
+++ b/app/models/venue.rb
@@ -20,8 +20,7 @@ class Venue < ApplicationRecord
   end
 
   def country_name
-    name = ISO3166::Country[country]
-    name&.iso_short_name
+    I18nData.countries[country]
   end
 
   def location?
diff --git a/app/views/conferences/_header.haml b/app/views/conferences/_header.haml
index c3a75bbc..cc9ffa8f 100644
--- a/app/views/conferences/_header.haml
+++ b/app/views/conferences/_header.haml
@@ -22,7 +22,7 @@
                       = sanitize link_to(venue.name, venue.website)
                     - else
                       = venue.city
-                      - if venue.country_name != 'US'
+                      - if venue.country_name
                         &bull;
                         = venue.country_name