diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index cf7dd11..5f70ee1 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -194,35 +194,38 @@ function field_update_8002() {
       continue;
     }
 
-    // Migrate 'widget' settings.
-    if (isset($data['widget'])) {
-      $widget_options = $data['widget'];
-      // Determine name and create initial entry in the $form_displays array.
-      $form_display_id = $record->entity_type . '.' . $record->bundle . '.default';
-      if (!isset($form_displays[$form_display_id])) {
-        $form_displays[$form_display_id] = _update_8000_entity_get_form_display($record->entity_type, $record->bundle, 'default');
-      }
+    // Do not place deleted fields in entity displays.
+    if (empty($record->deleted)) {
+      // Migrate 'widget' settings.
+      if (isset($data['widget'])) {
+        $widget_options = $data['widget'];
+        // Determine name and create initial entry in the $form_displays array.
+        $form_display_id = $record->entity_type . '.' . $record->bundle . '.default';
+        if (!isset($form_displays[$form_display_id])) {
+          $form_displays[$form_display_id] = _update_8000_entity_get_form_display($record->entity_type, $record->bundle, 'default');
+        }
 
-      // We do not need the 'module' key anymore.
-      unset($widget_options['module']);
-      $form_displays[$form_display_id]->set("content.$record->field_name", $widget_options);
-    }
+        // We do not need the 'module' key anymore.
+        unset($widget_options['module']);
+        $form_displays[$form_display_id]->set("content.$record->field_name", $widget_options);
+      }
 
-    // Migrate 'display' settings.
-    if (isset($data['display'])) {
-      foreach ($data['display'] as $view_mode => $display_options) {
-        // Determine name and create initial entry in the $displays array if it
-        // does not exist yet.
-        $display_id = $record->entity_type . '.' . $record->bundle . '.' . $view_mode;
-        if (!isset($displays[$display_id])) {
-          $displays[$display_id] = _update_8000_entity_get_display($record->entity_type, $record->bundle, $view_mode);
-        }
+      // Migrate 'display' settings.
+      if (isset($data['display'])) {
+        foreach ($data['display'] as $view_mode => $display_options) {
+          // Determine name and create initial entry in the $displays array if it
+          // does not exist yet.
+          $display_id = $record->entity_type . '.' . $record->bundle . '.' . $view_mode;
+          if (!isset($displays[$display_id])) {
+            $displays[$display_id] = _update_8000_entity_get_display($record->entity_type, $record->bundle, $view_mode);
+          }
 
-        // The display object does not store hidden fields.
-        if ($display_options['type'] != 'hidden') {
-          // We do not need the 'module' key anymore.
-          unset($display_options['module']);
-          $displays[$display_id]->set("content.$record->field_name", $display_options);
+          // The display object does not store hidden fields.
+          if ($display_options['type'] != 'hidden') {
+            // We do not need the 'module' key anymore.
+            unset($display_options['module']);
+            $displays[$display_id]->set("content.$record->field_name", $display_options);
+          }
         }
       }
     }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php
index 100dc85..d615512 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php
@@ -69,6 +69,10 @@ public function testEntityDisplayUpgrade() {
     $body_instance = field_info_instance('node', 'body', 'article');
     $this->assertTrue(!isset($body_instance['display']));
 
+    // Check that deleted fields were not added to the display.
+    $this->assertFalse(isset($displays['default']['content']['test_deleted_field']));
+    $this->assertFalse(isset($displays['teaser']['content']['test_deleted_field']));
+
     // Check that the 'language' extra field is configured as expected.
     $expected = array(
       'default' => array(
@@ -108,6 +112,9 @@ public function testEntityFormDisplayUpgrade() {
     $body_instance = field_info_instance('node', 'body', 'article');
     $this->assertTrue(!isset($body_instance['widget']));
 
+    // Check that deleted fields were not added to the display.
+    $this->assertFalse(isset($form_display['content']['test_deleted_field']));
+
     // Check that the 'title' extra field is configured as expected.
     $expected = array(
       'weight' => -5,