diff --git a/composer.json b/composer.json
index 8a9a61eb..d23f6005 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "license": "GPL-2.0+",
     "require": {
         "drupal/core": "^8.6",
-        "drupal/address": "^1.4",
+        "drupal/address": "^1.5",
         "drupal/entity": "^1.0-rc2",
         "drupal/entity_reference_revisions": "~1.0",
         "drupal/inline_entity_form": "^1.0-rc1",
diff --git a/modules/store/config/install/core.entity_form_display.commerce_store.online.default.yml b/modules/store/config/install/core.entity_form_display.commerce_store.online.default.yml
index b4effdc0..022ae950 100644
--- a/modules/store/config/install/core.entity_form_display.commerce_store.online.default.yml
+++ b/modules/store/config/install/core.entity_form_display.commerce_store.online.default.yml
@@ -12,8 +12,7 @@ mode: default
 content:
   address:
     type: address_default
-    settings:
-      default_country: site_default
+    settings: {  }
     weight: 3
     region: content
     third_party_settings: {  }
diff --git a/modules/store/src/Entity/Store.php b/modules/store/src/Entity/Store.php
index 1fd897ec..04d6025e 100644
--- a/modules/store/src/Entity/Store.php
+++ b/modules/store/src/Entity/Store.php
@@ -301,9 +301,6 @@ class Store extends ContentEntityBase implements StoreInterface {
       ])
       ->setDisplayOptions('form', [
         'type' => 'address_default',
-        'settings' => [
-          'default_country' => 'site_default',
-        ],
         'weight' => 3,
       ])
       ->setDisplayConfigurable('view', TRUE)
diff --git a/modules/store/tests/src/FunctionalJavascript/StoreTest.php b/modules/store/tests/src/FunctionalJavascript/StoreTest.php
index 578d6648..e7d8a109 100644
--- a/modules/store/tests/src/FunctionalJavascript/StoreTest.php
+++ b/modules/store/tests/src/FunctionalJavascript/StoreTest.php
@@ -93,20 +93,6 @@ class StoreTest extends CommerceWebDriverTestBase {
     $edit = [
       'name[0][value]' => 'Test2',
     ];
-    // The original address is not present on the form due to an Address bug.
-    // @todo Remove when #2838457 is fixed.
-    $address = [
-      'address_line1' => '1098 Alta Ave',
-      'locality' => 'Mountain View',
-      'administrative_area' => 'CA',
-      'postal_code' => '94043',
-    ];
-    $this->getSession()->getPage()->fillField('address[0][address][country_code]', 'US');
-    $this->getSession()->wait(4000, 'jQuery(\'select[name="address[0][address][administrative_area]"]\').length > 0 && jQuery.active == 0;');
-    foreach ($address as $property => $value) {
-      $path = 'address[0][address][' . $property . ']';
-      $edit[$path] = $value;
-    }
     $this->submitForm($edit, 'Save');
     $this->assertSession()->pageTextContains('Saved the Test2 store.');