diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 6c9b6b07e7..ebc825711d 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -6,6 +6,8 @@
  */
 
 use Drupal\Core\Config\ConfigImporter;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface;
 use Drupal\field\ConfigImporterFieldPurger;
@@ -361,22 +363,25 @@ function field_field_config_insert(FieldConfigInterface $field) {
   $entity_type_id = $field->getTargetEntityTypeId();
   $bundle = $field->getTargetBundle();
 
-  $view_modes = \Drupal::entityManager()->getViewModes($entity_type_id);
-  $form_modes = \Drupal::entityManager()->getFormModes($entity_type_id);
+  $entity_display_repository = \Drupal::service('entity_display.repository');
+  $view_modes = $entity_display_repository->getViewModes($entity_type_id);
+  $form_modes = $entity_display_repository->getFormModes($entity_type_id);
 
   // Update view modes.
   foreach ($view_modes as $view_mode_id => $view_mode) {
     if ($view_mode['status']) {
-      entity_get_display($entity_type_id, $bundle, $view_mode_id)
-        ->save();
+      if ($display = EntityViewDisplay::load($entity_type_id . '.' . $bundle . '.' . $view_mode_id)) {
+        $display->save();
+      }
     }
   }
 
   // Update form modes.
   foreach ($form_modes as $form_mode_id => $form_mode) {
     if ($form_mode['status']) {
-      entity_get_form_display($entity_type_id, $bundle, $form_mode_id)
-        ->save();
+      if ($form_display = EntityFormDisplay::load($entity_type_id . '.' . $bundle . '.' . $form_mode_id)) {
+        $form_display->save();
+      }
     }
   }
 }