diff --git a/paragraphs.module b/paragraphs.module
index 2fe6077..190e470 100644
--- a/paragraphs.module
+++ b/paragraphs.module
@@ -76,6 +76,39 @@ function paragraphs_theme_suggestions_paragraph(array $variables) {
 }
 
 /**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function paragraphs_form_entity_form_display_edit_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+  $field_definitions = \Drupal::service('entity_field.manager')->getFieldDefinitions($form['#entity_type'], $form['#bundle']);
+  foreach ($field_definitions as $key => $value) {
+    if ($field_definitions[$key]->getType() == 'entity_reference_revisions') {
+      if ($field_definitions[$key]->getSettings()['target_type'] == 'paragraph') {
+        // Loop over the display options of an err field with paragraph target
+        // type.
+        foreach ($form['fields'][$key]['plugin']['type']['#options'] as $option => $value) {
+          // Unset the widget display options that are no longer supported for
+          // the Paragraphs field.
+          if (in_array($option, ['options_buttons', 'options_select', 'entity_reference_revisions_autocomplete'])) {
+            unset($form['fields'][$key]['plugin']['type']['#options'][$option]);
+          }
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function paragraphs_form_field_storage_config_edit_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+  if ($form_state->getFormObject()->getEntity()->getType() == 'entity_reference') {
+    // Entity Reference fields are no longer supported for referencing
+    // Paragraphs.
+    unset($form['settings']['target_type']['#options'][(string) t('Content')]['paragraph']);
+  }
+}
+
+/**
  * Prepares variables for paragraph templates.
  *
  * Default template: paragraph.html.twig.
diff --git a/src/Tests/ParagraphsAdministrationTest.php b/src/Tests/ParagraphsAdministrationTest.php
index f453f20..94c428b 100644
--- a/src/Tests/ParagraphsAdministrationTest.php
+++ b/src/Tests/ParagraphsAdministrationTest.php
@@ -417,6 +417,22 @@ class ParagraphsAdministrationTest extends WebTestBase {
     $this->drupalPostAjaxForm(NULL, $edit, 'field_paragraphs_0_subform_field_paragraphs_add_more');
     // Test the new field is displayed.
     $this->assertFieldByName('files[field_paragraphs_0_subform_field_paragraphs_0_subform_field_image_only_0]');
+
+    $this->drupalGet('admin/structure/types/manage/article/form-display');
+    $select = $this->xpath('//*[@id="edit-fields-field-paragraphs-type"]')[0];
+    $this->assertEqual(count($select->option), 2);
+    // @todo Remove assert raw and uncomment assertOptionSelected after https://www.drupal.org/node/2530092
+    $this->assertRaw('value="entity_reference_paragraphs" selected="selected"');
+    //$this->assertOptionSelected('fields[field_paragraphs][type]', 'entity_reference_paragraphs');
+
+    $this->drupalGet('admin/structure/types/manage/article/fields/add-field');
+    $edit = [
+      'new_storage_type' => 'entity_reference',
+      'label' => 'unsupported field',
+      'field_name' => 'unsupportedfield',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save and continue'));
+    $this->assertNoOption('edit-settings-target-type', 'paragraph');
   }
 
   /**