diff --git a/views/addressfield.views.inc b/views/addressfield.views.inc
index fedda10..6332c88 100644
--- a/views/addressfield.views.inc
+++ b/views/addressfield.views.inc
@@ -42,6 +42,9 @@ function addressfield_field_views_data($field) {
     if (isset($table[$field['field_name']]['field'])) {
       // Use the parent field definition as a template for component columns.
       $field_def = $table[$field['field_name']]['field'];
+      // Remove 'additional fields' from the field definition.  We don't
+      // necessarily want all our sibling columns.
+      unset($field_def['additional fields']);
       // Define the valid columns.
       $valid_columns = array();
       foreach ($implemented as $implement) {