diff --git a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index e696a982fe..c9658c1f9f 100644
--- a/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -311,7 +311,9 @@ public function calculateDependencies() {
     // Depend on configured modes.
     if ($this->mode != 'default') {
       $mode_entity = $this->entityTypeManager()->getStorage('entity_' . $this->displayContext . '_mode')->load($target_entity_type->id() . '.' . $this->mode);
-      $this->addDependency('config', $mode_entity->getConfigDependencyName());
+      if (null !== $mode_entity) {
+        $this->addDependency('config', $mode_entity->getConfigDependencyName());
+      }
     }
     return $this;
   }