diff -u b/src/Plugin/Field/FieldWidget/EntityReference.php b/src/Plugin/Field/FieldWidget/EntityReference.php
--- b/src/Plugin/Field/FieldWidget/EntityReference.php
+++ b/src/Plugin/Field/FieldWidget/EntityReference.php
@@ -113,7 +113,7 @@
 
     $browsers = [];
     /** @var \Drupal\entity_browser\EntityBrowserInterface $browser */
-    foreach ($this->entityManager->getStorage('entity_browser')->loadMultiple() as $browser) {
+    foreach (\Drupal::entityTypeManager()->getStorage('entity_browser')->loadMultiple() as $browser) {
       $browsers[$browser->id()] = $browser->label();
     }
 
@@ -203,7 +203,7 @@
       return [t('No entity browser selected.')];
     }
     else {
-      $browser = $this->entityManager->getStorage('entity_browser')
+      $browser = \Drupal::entityTypeManager()->getStorage('entity_browser')
         ->load($entity_browser_id);
       $summary[] = t('Entity browser: @browser', ['@browser' => $browser->label()]);
     }
@@ -221,7 +221,7 @@
    */
   function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $entity_type = $this->fieldDefinition->getFieldStorageDefinition()->getSetting('target_type');
-    $entity_storage = $this->entityManager->getStorage($entity_type);
+    $entity_storage = \Drupal::entityTypeManager()->getStorage($entity_type);
     $field_widget_display = $this->fieldDisplayManager->createInstance(
       $this->getSetting('field_widget_display'),
       $this->getSetting('field_widget_display_settings') + ['entity_type' => $this->fieldDefinition->getFieldStorageDefinition()->getSetting('target_type')]
@@ -279,7 +279,7 @@
     $hidden_id = Html::getUniqueId('edit-' . $this->fieldDefinition->getName() . '-target-id');
     $details_id = Html::getUniqueId('edit-' . $this->fieldDefinition->getName());
     /** @var \Drupal\entity_browser\EntityBrowserInterface $entity_browser */
-    $entity_browser = $this->entityManager->getStorage('entity_browser')->load($this->getSetting('entity_browser'));
+    $entity_browser = \Drupal::entityTypeManager()->getStorage('entity_browser')->load($this->getSetting('entity_browser'));
 
     $element += [
       '#id' => $details_id,
only in patch2:
unchanged:
--- a/src/Plugin/EntityBrowser/FieldWidgetDisplay/ImageThumbnail.php
+++ b/src/Plugin/EntityBrowser/FieldWidgetDisplay/ImageThumbnail.php
@@ -80,7 +80,7 @@ class ImageThumbnail extends FieldWidgetDisplayBase implements ContainerFactoryP
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $options = [];
-    foreach ($this->entityManager->getStorage('image_style')->loadMultiple() as $id => $image_style) {
+    foreach (\Drupal::entityTypeManager()->getStorage('image_style')->loadMultiple() as $id => $image_style) {
       $options[$id] = $image_style->label();
     }
 
only in patch2:
unchanged:
--- a/src/Plugin/EntityBrowser/FieldWidgetDisplay/RenderedEntity.php
+++ b/src/Plugin/EntityBrowser/FieldWidgetDisplay/RenderedEntity.php
@@ -64,7 +64,7 @@ class RenderedEntity extends FieldWidgetDisplayBase implements ContainerFactoryP
    * {@inheritdoc}
    */
   public function view(EntityInterface $entity) {
-    return $this->entityManager->getViewBuilder($this->configuration['entity_type'])->view($entity, $this->configuration['view_mode']);
+    return \Drupal::entityTypeManager()->getViewBuilder($this->configuration['entity_type'])->view($entity, $this->configuration['view_mode']);
   }
 
   /**
only in patch2:
unchanged:
--- a/src/Plugin/EntityBrowser/Widget/Upload.php
+++ b/src/Plugin/EntityBrowser/Widget/Upload.php
@@ -93,7 +93,7 @@ class Upload extends WidgetBase {
     $files = [];
     foreach ($form_state->getValue(['upload'], []) as $fid) {
       /** @var \Drupal\file\FileInterface $file */
-      $file = $this->entityManager->getStorage('file')->load($fid);
+      $file = \Drupal::entityTypeManager()->getStorage('file')->load($fid);
       $file->setPermanent();
       $file->save();
       $files[] = $file;
only in patch2:
unchanged:
--- a/src/Plugin/EntityBrowser/Widget/View.php
+++ b/src/Plugin/EntityBrowser/Widget/View.php
@@ -203,7 +203,7 @@ class View extends WidgetBase implements ContainerFactoryPluginInterface {
     $entities = [];
     $ids = $form_state->get('view_widget_rows');
     foreach ($selected_rows as $row) {
-      $entities[] = $this->entityManager->getStorage($ids[$row]['type'])->load($ids[$row]['id']);
+      $entities[] = \Drupal::entityTypeManager()->getStorage($ids[$row]['type'])->load($ids[$row]['id']);
     }
 
     $this->selectEntities($entities, $form_state);