diff -u b/core/modules/media/images/icons/no-thumbnail.png b/core/modules/media/images/icons/no-thumbnail.png
--- b/core/modules/media/images/icons/no-thumbnail.png
+++ b/core/modules/media/images/icons/no-thumbnail.png
diff -u b/core/modules/media/src/Plugin/media/Source/Image.php b/core/modules/media/src/Plugin/media/Source/Image.php
--- b/core/modules/media/src/Plugin/media/Source/Image.php
+++ b/core/modules/media/src/Plugin/media/Source/Image.php
@@ -62,17 +62,17 @@
    *   Entity type manager service.
    * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
    *   Entity field manager service.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   Media entity config object.
    * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
    *   The field type plugin manager service.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
    * @param \Drupal\Core\Image\ImageFactory $image_factory
    *   The image factory.
    * @param \Drupal\Core\File\FileSystem $file_system
    *   File system service.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, ConfigFactoryInterface $config, FieldTypePluginManagerInterface $field_type_manager, ImageFactory $image_factory, FileSystem $file_system) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $config, $field_type_manager);
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, FieldTypePluginManagerInterface $field_type_manager, ConfigFactoryInterface $config_factory, ImageFactory $image_factory, FileSystem $file_system) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $field_type_manager, $config_factory);
 
     $this->imageFactory = $image_factory;
     $this->fileSystem = $file_system;
@@ -88,8 +88,8 @@
       $plugin_definition,
       $container->get('entity_type.manager'),
       $container->get('entity_field.manager'),
-      $container->get('config.factory'),
       $container->get('plugin.manager.field.field_type'),
+      $container->get('config.factory'),
       $container->get('image.factory'),
       $container->get('file_system')
     );
@@ -124,12 +124,6 @@
    * {@inheritdoc}
    */
   public function getMetadata(MediaInterface $media, $name) {
-    $value = parent::getMetadata($media, $name);
-
-    if ($value !== NULL) {
-      return $value;
-    }
-
     // Get the file, image and EXIF data.
     /** @var \Drupal\file\FileInterface $file */
     $file = $media->get($this->configuration['source_field'])->entity;
@@ -142,10 +136,10 @@
     // Return the field.
     switch ($name) {
       case 'width':
-        return $image->getWidth() ?: FALSE;
+        return $image->getWidth() ?: NULL;
 
       case 'height':
-        return $image->getHeight() ?: FALSE;
+        return $image->getHeight() ?: NULL;
 
       case 'thumbnail_uri':
         return $uri;
@@ -175,7 +169,7 @@
       }
     }
 
-    return NULL;
+    return parent::getMetadata($media, $name);
   }
 
   /**
@@ -220,7 +214,7 @@
       $this->exif = $this->getExifData($uri);
     }
 
-    return $this->exif[$field] ?: FALSE;
+    return $this->exif[$field] ?: NULL;
   }
 
   /**