diff --git a/src/Plugin/Field/FieldType/AddressItem.php b/src/Plugin/Field/FieldType/AddressItem.php
index 4e02bd4..a254e0f 100644
--- a/src/Plugin/Field/FieldType/AddressItem.php
+++ b/src/Plugin/Field/FieldType/AddressItem.php
@@ -377,4 +377,12 @@ class AddressItem extends FieldItemBase implements AddressInterface {
     return $this->family_name;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getValue() {
+    // Do not return empty keys to avoid breaking fields comparisons.
+    return array_filter(parent::getValue());
+  }
+
 }