diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index a56f701621854ef14a3725ebae4c714f5c4d9422..0cbb89a39e70e1ef0218afb1164a117d4fd37414 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -350,6 +350,7 @@ protected function defaultImageForm(array &$element, array $settings) {
       '#default_value' => empty($settings['default_image']['fid']) ? array() : array($settings['default_image']['fid']),
       '#upload_location' => $settings['uri_scheme'] . '://default_images/',
       '#element_validate' => array('file_managed_file_validate', array(get_class($this), 'validateDefaultImageForm')),
+      '#upload_validators' => $this->getUploadValidators(),
     );
     $element['default_image']['alt'] = array(
       '#type' => 'textfield',
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index d0fabfa0054185eaf03687fab3a024c134105362..38fc1425ccd24ca15b4077ceca0257c15aa5c9f5 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -278,6 +278,10 @@ public function testDefaultImages() {
         array('@fid' => $default_images['instance2']->id())
       )
     );
+
+    $non_image = $this->drupalGetTestFiles('text');
+    $this->drupalPostForm(NULL, array('files[instance_settings_default_image_fid]' => drupal_realpath($non_image[0]->uri)), t("Upload"));
+    $this->assertText(t('The specified file text-0.txt could not be uploaded. Only files with the following extensions are allowed: png gif jpg jpeg.'), 'Non-image file cannot be used as default image.');
   }
 
   /**