diff --git a/addressfield.module b/addressfield.module
index 177d92b..1ad8149 100644
--- a/addressfield.module
+++ b/addressfield.module
@@ -475,6 +475,12 @@ function addressfield_standard_country_validate($element, &$form_state) {
     $form_state['rebuild'] = TRUE;
   }
 
+  // If the country change triggered the submission, kill all errors.
+  if (_form_element_triggered_scripted_submission($element, $form_state)) {
+    drupal_get_messages();
+    drupal_static_reset('form_set_error');
+  }
+
   $parents = $element['#parents'];
   array_pop($parents);