diff --git a/location.install b/location.install
index 9405e1b2399ad1cd6453446e21f006da6a8ed48e..268e8a04de06edfb4e5a4535489a881474d14163 100644
--- a/location.install
+++ b/location.install
@@ -1088,6 +1088,11 @@ function location_update_6305() {
  * Add per-location-field weights and defaults.
  */
 function location_update_6306() {
+  // Skip this update if it was already done on the 5.x side.
+  if (variable_get('location_update_5306_done', FALSE)) {
+    variable_del('location_update_5306_done');
+    return array();
+  }
   $ret = array();
   $result = db_query("SELECT name FROM {variable} WHERE name LIKE 'location_settings_%'");
   while ($row = db_fetch_object($result)) {