diff --git a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
index 55b613a..374ab7c 100644
--- a/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -198,6 +198,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       $cache_tags = $image_style->getCacheTags();
     }
 
+    /** @var \Drupal\file\FileInterface $file */
     foreach ($files as $delta => $file) {
       $cache_contexts = array();
       if (isset($link_file)) {
@@ -218,6 +219,12 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       $item_attributes = $item->_attributes;
       unset($item->_attributes);
 
+      // If the file is SVG, don't apply any image style. The image style system
+      // only handles raster images.
+      if ($file->getMimeType() == 'image/svg+xml') {
+        $image_style_setting = '';
+      }
+
       $elements[$delta] = array(
         '#theme' => 'image_formatter',
         '#item' => $item,