diff --git a/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php b/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php
index 284eadd..425e878 100644
--- a/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php
+++ b/src/Drupal/Driver/Fields/Drupal8/AddressHandler.php
@@ -49,6 +49,12 @@ public function expand($values) {
           $return[$k] = $value;
           break;
         }
+        // If the value array contains keys for the address fields array, use
+        // the keyed value.
+        elseif (isset($value[$k])) {
+          $return[$k] = $value[$k];
+          continue;
+        }
         if ($idx < count($value)) {
           // Gracefully handle users providing too few field component values.
           $return[$k] = $value[$idx];