diff --git a/metatag.install b/metatag.install
index 5fdd28a..cb8908d 100644
--- a/metatag.install
+++ b/metatag.install
@@ -219,7 +219,7 @@ function metatag_update_8102(&$sandbox) {
  */
 function metatag_update_8103() {
   $config_installer = \Drupal::service('config.installer');
-  $entity_manager = \Drupal::service('entity.manager');
+  $entity_manager = \Drupal::entityTypeManager();
 
   /**
    * 1. Install cofiguration.
@@ -293,14 +293,16 @@ function metatag_update_8103() {
       $bundle_label = $bundle_info[$entity_bundle]['label'];
       $label = $entity_label . ': ' . $bundle_label;
 
-      $entity = entity_load('metatag_defaults', $metatag_defaults_id);
+      $metatags_global_manager = $entity_manager->getStorage('metatag_defaults');
+
+      $entity = $metatags_global_manager->load($metatag_defaults_id);
       if ($entity) {
         // These are defaults for an existing config entity, such as User.
         $entity->set('tags', $values);
       }
       else {
         // These are bundle overrides.
-        $entity = entity_create('metatag_defaults', [
+        $entity = $metatags_global_manager->create([
           'id' => $metatag_defaults_id,
           'label' => $label,
           'tags' => $values,
diff --git a/metatag.module b/metatag.module
index 7486385..3baa573 100644
--- a/metatag.module
+++ b/metatag.module
@@ -236,21 +236,23 @@ function metatag_get_tags_from_route() {
  *   Array of tags or NULL;
  */
 function metatag_get_default_tags() {
+  /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $global_metatag_manager */
+  $global_metatag_manager = \Drupal::entityTypeManager()->getStorage('metatag_defaults');
   // First we load global defaults.
-  $metatags = entity_load('metatag_defaults', 'global');
+  $metatags = $global_metatag_manager->load('global');
   if (!$metatags) {
     return;
   }
 
   // Lastly, check if this is a special page.
   if (\Drupal::service('path.matcher')->isFrontPage()) {
-    $special_metatags = entity_load('metatag_defaults', 'front');
+    $special_metatags = $global_metatag_manager->load('front');
   }
   elseif (\Drupal::service('current_route_match')->getRouteName() == 'system.403') {
-    $special_metatags = entity_load('metatag_defaults', '403');
+    $special_metatags = $global_metatag_manager->load('403');
   }
   elseif (\Drupal::service('current_route_match')->getRouteName() == 'system.404') {
-    $special_metatags = entity_load('metatag_defaults', '404');
+    $special_metatags = $global_metatag_manager->load('404');
   }
   if (isset($special_metatags)) {
     $metatags->set('tags', array_merge($metatags->get('tags'), $special_metatags->get('tags')));
@@ -259,15 +261,16 @@ function metatag_get_default_tags() {
   // Next check if there is this page is an entity that has meta tags.
   else {
     $entity = metatag_get_route_entity();
+
     if (!empty($entity)) {
-      $entity_metatags = entity_load('metatag_defaults', $entity->getEntityTypeId());
+      $entity_metatags = $global_metatag_manager->load($entity->getEntityTypeId());
       if ($entity_metatags != NULL) {
         // Merge with global defaults.
         $metatags->set('tags', array_merge($metatags->get('tags'), $entity_metatags->get('tags')));
       }
 
       // Finally, check if we should apply bundle overrides.
-      $bundle_metatags = entity_load('metatag_defaults', $entity->getEntityTypeId() . '__' . $entity->bundle());
+      $bundle_metatags = $global_metatag_manager->load($entity->getEntityTypeId() . '__' . $entity->bundle());
       if ($bundle_metatags != NULL) {
         // Merge with existing defaults.
         $metatags->set('tags', array_merge($metatags->get('tags'), $bundle_metatags->get('tags')));
diff --git a/src/Form/MetatagDefaultsForm.php b/src/Form/MetatagDefaultsForm.php
index e33ee03..c448621 100644
--- a/src/Form/MetatagDefaultsForm.php
+++ b/src/Form/MetatagDefaultsForm.php
@@ -111,7 +111,7 @@ class MetatagDefaultsForm extends EntityForm {
       $metatag_defaults_id = $form_state->getValue('id');
       list($entity_type, $entity_bundle) = explode('__', $metatag_defaults_id);
       // Get the entity label.
-      $entity_manager = \Drupal::service('entity.manager');
+      $entity_manager = \Drupal::service('entity_type.manager');
       $entity_info = $entity_manager->getDefinitions();
       $entity_label = (string) $entity_info[$entity_type]->get('label');
       // Get the bundle label.
@@ -167,12 +167,13 @@ class MetatagDefaultsForm extends EntityForm {
       'node' => 'Node',
       'taxonomy_term' => 'Taxonomy term',
     ];
-    $entity_manager = \Drupal::service('entity.manager');
+    $entity_manager = \Drupal::service('entity_type.manager');
     foreach ($entity_types as $entity_type => $entity_label) {
       $bundles = $entity_manager->getBundleInfo($entity_type);
       foreach ($bundles as $bundle_id => $bundle_metadata) {
         $metatag_defaults_id = $entity_type . '__' . $bundle_id;
-        if (empty(entity_load('metatag_defaults', $metatag_defaults_id))) {
+        $metatags_defaults_manager = $entity_manager->getStorage('metatag_defaults');
+        if (empty($metatags_defaults_manager->load($metatag_defaults_id))) {
           $options[$entity_label][$metatag_defaults_id] = $bundle_metadata['label'];
         }
       }