diff --git a/core/modules/media/src/Entity/Media.php b/core/modules/media/src/Entity/Media.php
index 0351f1e..84164b6 100644
--- a/core/modules/media/src/Entity/Media.php
+++ b/core/modules/media/src/Entity/Media.php
@@ -93,11 +93,10 @@ public function getName() {
 
     if ($name->isEmpty()) {
       $media_source = $this->getSource();
-      return $media_source->getMetadata($this, $media_source->getPluginDefinition()['default_name_metadata_attribute']);
-    }
-    else {
-      return $name->value;
+      $this->setName($media_source->getMetadata($this, $media_source->getPluginDefinition()['default_name_metadata_attribute']));
     }
+
+    return $name->value;
   }
 
   /**