diff --git a/consumers.install b/consumers.install
index 99a95d3..25cd094 100644
--- a/consumers.install
+++ b/consumers.install
@@ -97,9 +97,16 @@ function consumers_update_8105() {
 }
 
 /**
- * Update entity definition to add the "owner" key and adapt the field.
+ * Removed
  */
 function consumers_update_8106() {
+  // This is intentionally left empty.
+}
+
+/**
+ * Update entity definition to add the "owner" key and adapt the field.
+ */
+function consumers_update_8107() {
   $edum = \Drupal::entityDefinitionUpdateManager();
   $entity_type = $edum->getEntityType('consumer');
   $keys = $entity_type->getKeys();
@@ -110,14 +117,24 @@ function consumers_update_8106() {
     ->setLabel(new TranslatableMarkup('User ID'))
     ->setSetting('target_type', 'user')
     ->setTranslatable($entity_type->isTranslatable())
-    ->setDefaultValueCallback(Consumer::class . '::getDefaultEntityOwner');
+    ->setDefaultValueCallback(Consumer::class . '::getDefaultEntityOwner')
+    ->setInitialValue(0);
   $field_storage_definition = $field_definition
     ->getFieldStorageDefinition();
   $has_original = (bool) $edum->getFieldStorageDefinition(
     $owner_key,
     $field_storage_definition->getTargetEntityTypeId()
   );
-  $has_original
-    ? $edum->updateFieldStorageDefinition($field_storage_definition)
-    : $edum->installFieldStorageDefinition('owner_id', 'consumer', 'consumers', $field_definition);
+
+  if ($has_original) {
+    \Drupal::database()->update($entity_type->getDataTable())
+      ->fields([$owner_key => 0])
+      ->isNull($owner_key)
+      ->execute();
+
+    $edum->updateFieldStorageDefinition($field_storage_definition);
+  }
+  else {
+    $edum->installFieldStorageDefinition('owner_id', 'consumer', 'consumers', $field_definition);
+  }
 }