diff --git a/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php b/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
index eb6ae7d..f6f224e 100644
--- a/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
+++ b/core/lib/Drupal/Core/Entity/Field/Type/EntityWrapper.php
@@ -90,7 +90,7 @@ public function setValue($value, $notify = TRUE) {
     if ($value instanceof EntityInterface && $value->isNew()) {
       $this->newEntity = $value;
       $this->entityType = $value->entityType();
-      $value = FALSE;
+      $value = 0;
     }
     elseif ($value instanceof EntityInterface) {
       $this->entityType = $value->entityType();
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php
index 7ceb350..01a01fa 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/field/widget/TaxonomyAutocompleteWidget.php
@@ -97,7 +97,7 @@ public function massageFormValues(array $values, array $form, array &$form_state
           'vid' => $vocabulary->id(),
           'name' => $value,
         ));
-        $item = array('tid' => FALSE, 'entity' => $term);
+        $item = array('tid' => 0, 'entity' => $term);
       }
       $items[] = $item;
     }