diff --git a/contrib/location_cck/location_cck.module b/contrib/location_cck/location_cck.module
index 57dcd48..0a3052f 100644
--- a/contrib/location_cck/location_cck.module
+++ b/contrib/location_cck/location_cck.module
@@ -405,6 +405,8 @@ function location_cck_field_widget_form(&$form, &$form_state, $field, $instance,
       '#required' => $instance['required'],
       '#location_settings' => $settings,
       '#default_value' => $location,
+      '#value' => '',
+      '#has_garbage_value' => TRUE
     );
 
     return $element;
diff --git a/location.module b/location.module
index 791e881..5c568f7 100644
--- a/location.module
+++ b/location.module
@@ -1727,6 +1727,8 @@ function location_form($settings, $locations) {
     }
     $form[$i] = array(
       '#type' => 'location_element',
+      '#has_garbage_value' => TRUE,
+      '#value' => '',
       '#title' => t('Location #%number', array('%number' => $i + 1)),
       '#default_value' => isset($locations[$i]) ? $locations[$i] : NULL,
       '#location_settings' => $settings,