diff --git a/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php b/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php
index bb9b2064f..efc776390 100644
--- a/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php
+++ b/src/Plugin/GraphQL/DataProducer/Entity/Fields/Image/ImageDerivative.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\file\FileInterface;
+use Drupal\file_entity\FileEntityInterface;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 use Drupal\image\Entity\ImageStyle;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -100,6 +101,15 @@ public function resolve(FileInterface $entity = NULL, $style, RefinableCacheable
 
       $width = $entity->width;
       $height = $entity->height;
+      // Optionally support the extra data from file_entity.
+      if ($entity instanceof FileEntityInterface) {
+        if (empty($width)) {
+          $width = $entity->getMetadata('width');
+        }
+        if (empty($height)) {
+          $height = $entity->getMetadata('height');
+        }
+      }
 
       // @todo Not sure why PHPStan complains here, this should be refactored to
       // check the entity properties first.