diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/config/serializer/Model.Country.yml b/src/CoreShop/Bundle/AddressBundle/Resources/config/serializer/Model.Country.yml
index d10d22ba2b..e13a5dfaf3 100755
--- a/src/CoreShop/Bundle/AddressBundle/Resources/config/serializer/Model.Country.yml
+++ b/src/CoreShop/Bundle/AddressBundle/Resources/config/serializer/Model.Country.yml
@@ -34,6 +34,7 @@ CoreShop\Component\Address\Model\Country:
         getZoneName:
             serialized_name: zoneName
             groups: [List, Detailed]
-        getName:
+        name:
             serialized_name: name
+            exp: 'object.getName() ? object.getName() : object.getIsoCode()'
             groups: [List, Detailed]
diff --git a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js
index 67d5941924..9fda27224a 100644
--- a/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js
+++ b/src/CoreShop/Bundle/AddressBundle/Resources/public/pimcore/js/country/panel.js
@@ -49,12 +49,6 @@ coreshop.country.panel = Class.create(coreshop.resource.panel, {
         $super();
     },
 
-    getGridDisplayColumnRenderer: function (value, metadata, record) {
-        metadata.tdAttr = 'data-qtip="ID: ' + record.get('id') + '"';
-
-        return value ? value : record.get('isoCode');
-    },
-
     getGridConfiguration: function () {
         return {
             store: this.store,