diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 4478e7e5a7..dea6c326ee 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -534,7 +534,7 @@ function image_form_editor_image_dialog_alter(array &$form, FormStateInterface $
     return;
   }
 
-  if (empty($form_state->getValue('fid')[0])) {
+  if (empty($form['fid']['#default_value'])) {
     // There is no file to apply an image style.
     return;
   }
diff --git a/core/modules/image/image.post_update.php b/core/modules/image/image.post_update.php
index a5d630538f..e5fb4d605d 100644
--- a/core/modules/image/image.post_update.php
+++ b/core/modules/image/image.post_update.php
@@ -9,7 +9,6 @@
 use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\filter\Entity\FilterFormat;
-use Drupal\filter\Plugin\FilterInterface;
 
 /**
  * Saves the image style dependencies into form and view display entities.
diff --git a/core/modules/image/js/plugins/drupalimagestyle/plugin.es6.js b/core/modules/image/js/plugins/drupalimagestyle/plugin.es6.js
index 06bb723027..56a1e4eaee 100644
--- a/core/modules/image/js/plugins/drupalimagestyle/plugin.es6.js
+++ b/core/modules/image/js/plugins/drupalimagestyle/plugin.es6.js
@@ -5,8 +5,6 @@
  * This alters the existing CKEditor image2 widget plugin, which is already
  * altered by the Drupal Image plugin, to allow for the data-image-style
  * attribute to be set.
- *
- * @ignore
  */
 
 (function(CKEDITOR) {