diff --git a/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php b/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
index d71c201..54a153f 100644
--- a/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
+++ b/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
@@ -55,7 +55,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    */
   public static function defaultFieldSettings() {
     $default_settings = array();
-    $labels = \Drupal::entityManager()->getEntityTypeLabels(TRUE);
+    $labels = \Drupal::service('entity_type.repository')->getEntityTypeLabels(TRUE);
     $options = $labels[(string) t('Content', [], ['context' => 'Entity type group'])];
     // Field storage settings are not accessible here so we are assuming that
     // all the entity types are referenceable by default.
@@ -175,7 +175,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    */
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
     // @todo inject this.
-    $labels = \Drupal::entityManager()->getEntityTypeLabels(TRUE);
+    $labels = \Drupal::service('entity_type.repository')->getEntityTypeLabels(TRUE);
 
     $element['exclude_entity_types'] = array(
       '#type' => 'checkbox',
@@ -204,7 +204,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
     $settings_form = array();
     $settings = $this->getSettings();
     foreach (static::getTargetTypes($settings) as $target_type) {
-      $entity_type = \Drupal::entityManager()->getDefinition($target_type);
+      $entity_type = \Drupal::entityTypeManager()->getDefinition($target_type);
       $settings_form[$target_type] = $this->targetTypeFieldSettingsForm($form, $form_state, $target_type);
       $settings_form[$target_type]['handler']['#title'] = t('Reference type for @target_type', ['@target_type' => $entity_type->getLabel()]);
     }
@@ -215,7 +215,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    * Returns a form for single target type settings.
    *
    * This is same as
-   * \Drupal\entity_reference\ConfigurableEntityReferenceItem::fieldSettingsForm()
+   * \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem::fieldSettingsForm()
    * but it uses dynamic_entity_reference_selection plugin manager instead of
    * entity_reference_selection plugin manager.
    *
@@ -253,8 +253,8 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
 
     $form = array(
       '#type' => 'container',
-      '#process' => array(array(get_class($this), 'fieldSettingsAjaxProcess')),
-      '#element_validate' => array(array(get_class($this), 'fieldSettingsFormValidate')),
+      '#process' => [[EntityReferenceItem::class, 'fieldSettingsAjaxProcess']],
+      '#element_validate' => [[DynamicEntityReferenceItem::class, 'fieldSettingsFormValidate']],
     );
     $form['handler'] = array(
       '#type' => 'details',
@@ -303,20 +303,40 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    *   The form state of the (entire) configuration form.
    */
   public static function fieldSettingsFormValidate(array $form, FormStateInterface $form_state) {
-    if ($form_state->hasValue('field')) {
-      $settings = $form_state->getValue(array('field', 'settings'));
-      foreach (array_keys($settings) as $target_type) {
-        $form_state->unsetValue(array(
-          'field',
+    /** @var \Drupal\field\Entity\FieldConfig $field */
+    $field = $form_state->getFormObject()->getEntity();
+    foreach (static::getTargetTypes($field->getSettings()) as $target_type) {
+      // If no checkboxes were checked for 'target_bundles', store NULL ("all
+      // bundles are referenceable") rather than empty array ("no bundle is
+      // referenceable" - typically happens when all referenceable bundles have
+      // been deleted).
+      if ($form_state->getValue([
+        'settings',
+        $target_type,
+        'handler_settings',
+        'target_bundles',
+      ]) === []) {
+        $form_state->setValue([
           'settings',
           $target_type,
-          'handler_submit',
-        ));
-        /** @var \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface $handler */
-        $handler = \Drupal::service('plugin.manager.dynamic_entity_reference_selection')->getSelectionHandler($form_state->get('field'), NULL, $target_type);
-        $handler->validateConfigurationForm($form, $form_state);
+          'handler_settings',
+          'target_bundles',
+        ], NULL);
       }
-      $form_state->get('field')->settings = $form_state->getValue(array('field', 'settings'));
+      // Don't store the 'target_bundles_update' button value into the field
+      // config settings.
+      $form_state->unsetValue([
+        'settings',
+        $target_type,
+        'handler_settings',
+        'target_bundles_update',
+      ]);
+      $form_state->unsetValue([
+        'settings',
+        $target_type,
+        'handler_submit',
+      ]);
+
     }
   }
 
@@ -442,7 +462,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    */
   public static function calculateDependencies(FieldDefinitionInterface $field_definition) {
     $dependencies = FieldItemBase::calculateDependencies($field_definition);
-    $manager = \Drupal::entityManager();
+    $manager = \Drupal::service('entity.repository');
     if ($default_value = $field_definition->getDefaultValueLiteral()) {
       foreach ($default_value as $value) {
         if (is_array($value) && isset($value['target_uuid']) && isset($value['target_type'])) {
@@ -466,7 +486,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
     if ($default_value = $field_definition->getDefaultValueLiteral()) {
       foreach ($default_value as $key => $value) {
         if (is_array($value) && isset($value['target_uuid']) && isset($value['target_type'])) {
-          $entity = \Drupal::entityManager()->loadEntityByUuid($value['target_type'], $value['target_uuid']);
+          $entity = \Drupal::service('entity.repository')->loadEntityByUuid($value['target_type'], $value['target_uuid']);
           // @see \Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceFieldItemList::processDefaultValue()
           if ($entity && isset($dependencies[$entity->getConfigDependencyKey()][$entity->getConfigDependencyName()])) {
             unset($default_value[$key]);
@@ -507,7 +527,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    */
   public static function calculateStorageDependencies(FieldStorageDefinitionInterface $field_definition) {
     $dependencies = FieldItemBase::calculateStorageDependencies($field_definition);
-    $entity_manager = \Drupal::entityManager();
+    $entity_manager = \Drupal::entityTypeManager();
     foreach (array_keys(static::defaultFieldSettings()) as $entity_type_id) {
       if ($entity_manager->hasDefinition($entity_type_id) && $target_entity_type = $entity_manager->getDefinition($entity_type_id)) {
         $dependencies['module'][] = $target_entity_type->getProvider();
diff --git a/tests/src/FunctionalJavascript/DynamicEntityReferenceTest.php b/tests/src/FunctionalJavascript/DynamicEntityReferenceTest.php
new file mode 100644
index 0000000..5262e92
--- /dev/null
+++ b/tests/src/FunctionalJavascript/DynamicEntityReferenceTest.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Drupal\Tests\dynamic_entity_reference\FunctionalJavascript;
+
+use Behat\Mink\Exception\ElementNotFoundException;
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\entity_test\Entity\EntityTestBundle;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
+
+/**
+ * Ensures that Dynamic Entity References field works correctly.
+ *
+ * @group dynamic_entity_reference
+ */
+class DynamicEntityReferenceTest extends JavascriptTestBase {
+
+  /**
+   * The admin user.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  protected $adminUser;
+
+  /**
+   * The another user.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  protected $anotherUser;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'entity_reference',
+    'field_ui',
+    'dynamic_entity_reference',
+    'entity_test',
+  ];
+
+  /**
+   * Permissions to grant admin user.
+   *
+   * @var array
+   */
+  protected $permissions = [
+    'access administration pages',
+    'view test entity',
+    'administer entity_test fields',
+    'administer entity_test content',
+    'access user profiles',
+  ];
+
+  /**
+   * Sets the test up.
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser($this->permissions);
+    $this->anotherUser = $this->drupalCreateUser();
+  }
+
+  /**
+   * Tests if the toolbar can be toggled with JavaScript.
+   */
+  public function testFieldSettings() {
+    $assert_session = $this->assertSession();
+    // Add EntityTestBundle for EntityTestWithBundle.
+    EntityTestBundle::create([
+      'id' => 'test',
+      'label' => 'Test label',
+      'description' => 'My test description',
+    ])->save();
+    $this->drupalLogin($this->adminUser);
+    // Add a new dynamic entity reference field.
+    $this->drupalGet('entity_test/structure/entity_test/fields/add-field');
+    $edit = [
+      'label' => 'Foobar',
+      'field_name' => 'foobar',
+      'new_storage_type' => 'dynamic_entity_reference',
+    ];
+    $this->submitForm($edit, t('Save and continue'), 'field-ui-field-storage-add-form');
+    $page = $this->getSession()->getPage();
+    $entity_type_ids_select = $assert_session->selectExists('settings[entity_type_ids][]', $page);
+    $entity_type_ids_select->selectOption('user');
+    $entity_type_ids_select->selectOption('entity_test', TRUE);
+    $assert_session->selectExists('cardinality', $page)
+      ->selectOption(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+    $page->uncheckField('settings[exclude_entity_types]');
+    $this->submitForm([], t('Save field settings'), 'field-storage-config-edit-form');
+    $target_type_select = $assert_session->selectExists('default_value_input[field_foobar][0][target_type]');
+    $target_type_select->selectOption('user');
+    $target_type_select->selectOption('entity_test');
+    $page = $this->getSession()->getPage();
+    $page->checkField('settings[entity_test][handler_settings][target_bundles][entity_test]');
+    $this->assertJsCondition('(typeof(jQuery)=="undefined" || (0 === jQuery.active && 0 === jQuery(\':animated\').length))', 20000);
+    $page->checkField('settings[entity_test][handler_settings][auto_create]');
+    $this->submitForm([], t('Save settings'), 'field-config-edit-form');
+    $assert_session->pageTextContains('Saved Foobar configuration');
+    \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
+    $field_storage = FieldStorageConfig::loadByName('entity_test', 'field_foobar');
+    $this->assertEmpty($field_storage->getSetting('exclude_entity_types'));
+    $this->assertEquals($field_storage->getSetting('entity_type_ids'), ['entity_test' => 'entity_test', 'user' => 'user']);
+    $field_config = FieldConfig::loadByName('entity_test', 'entity_test', 'field_foobar');
+    $settings = $field_config->getSettings();
+    $this->assertEquals($settings['entity_test']['handler'], 'default:entity_test');
+    $this->assertNotEmpty($settings['entity_test']['handler_settings']);
+    $this->assertEquals($settings['entity_test']['handler_settings']['target_bundles'], ['entity_test' => 'entity_test']);
+    $this->assertTrue($settings['entity_test']['handler_settings']['auto_create']);
+    $this->assertEmpty($settings['entity_test']['handler_settings']['auto_create_bundle']);
+  }
+
+}