diff --git a/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatter.php
index 69bf5f5..efd72e0 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -101,9 +101,12 @@ public function viewElements(FieldItemListInterface $items) {
     $image_link_setting = $this->getSetting('image_link');
     // Check if the formatter involves a link.
     if ($image_link_setting == 'content') {
-      $uri = $items->getEntity()->urlInfo();
-      // @todo Remove when theme_image_formatter() has support for route name.
-      $uri['path'] = $items->getEntity()->getSystemPath();
+      $entity = $items->getEntity();
+      if (!$entity->isNew()) {
+        $uri = $entity->urlInfo();
+        // @todo Remove when theme_image_formatter() has support for route name.
+        $uri['path'] = $entity->getSystemPath();
+      }
     }
     elseif ($image_link_setting == 'file') {
       $link_file = TRUE;