diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 888e696..a266ea4 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -504,9 +504,9 @@ function image_field_config_delete(FieldConfigInterface $field) {
  * @see \Drupal\editor\Form\EditorImageDialog::buildForm()
  */
 function image_form_editor_image_dialog_alter(&$form, FormStateInterface $form_state) {
-  /** @var \Drupal\filter\Entity\FilterFormat $filter_format */
-  $filter_format = $form_state->getBuildInfo()['args'][0];
-  $filters = $filter_format->filters()->getAll();
+  /** @var \Drupal\editor\Entity\Editor $editor */
+  $editor = $form_state->getBuildInfo()['args'][0];
+  $filters = $editor->getFilterFormat()->filters()->getAll();
 
   // Alter the editor image dialog when image style functionality is available,
   // unless the responsive image style filter is also in use.
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 3d6e1bc..228159e 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -529,10 +529,9 @@ function responsive_image_library_info_alter(array &$libraries, $module) {
  * @see \Drupal\editor\Form\EditorImageDialog::buildForm()
  */
 function responsive_image_form_editor_image_dialog_alter(&$form, FormStateInterface $form_state) {
-
-  /** @var \Drupal\filter\Entity\FilterFormat $filter_format */
-  $filter_format = $form_state->getBuildInfo()['args'][0];
-  $filters = $filter_format->filters()->getAll();
+  /** @var \Drupal\editor\Entity\Editor $editor */
+  $editor = $form_state->getBuildInfo()['args'][0];
+  $filters = $editor->getFilterFormat()->filters()->getAll();
 
   // Alter the editor image dialog when responsive image style functionality is
   // available.