diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php
index 64b46c2..7cfd710 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteTagsWidget.php
@@ -31,7 +31,10 @@ class EntityReferenceAutocompleteTagsWidget extends EntityReferenceAutocompleteW
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $element = parent::formElement($items, $delta, $element, $form, $form_state);
 
-    $element['target_id']['#tags'] = TRUE;
+    // If the field can only store a single value, allow users to enter strings
+    // with special characters (e.g. commas) without wrapping them in quotes.
+    // @see \Drupal\Core\Entity\Element\EntityAutocomplete::validateEntityAutocomplete()
+    $element['target_id']['#tags'] = $this->fieldDefinition->getFieldStorageDefinition()->isMultiple();
     $element['target_id']['#default_value'] = $items->referencedEntities();
 
     return $element;