diff --git a/core/modules/media/src/Controller/MediaFilterController.php b/core/modules/media/src/Controller/MediaFilterController.php
index fbcedb1876..4b9ea6bfef 100644
--- a/core/modules/media/src/Controller/MediaFilterController.php
+++ b/core/modules/media/src/Controller/MediaFilterController.php
@@ -2,14 +2,12 @@
 
 namespace Drupal\media\Controller;
 
-use Drupal\Component\Utility\Html;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Entity\EntityRepositoryInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\filter\FilterFormatInterface;
-use Drupal\media\MediaInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -51,7 +49,7 @@ class MediaFilterController implements ContainerInjectionInterface {
    *
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer service.
-   * @param \Drupal\Core\Entity\ContentEntityStorageInterface
+   * @param \Drupal\Core\Entity\ContentEntityStorageInterface $media_storage
    *   The media storage.
    * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
    *   The entity repository.
diff --git a/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index efc7b7b8de..b894c824e4 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -1001,7 +1001,12 @@ public function testEmbedPreviewAccess($media_embed_enabled, $can_use_format) {
 
     $text = '<drupal-media data-caption="baz" data-entity-type="media" data-entity-uuid="' . $this->media->uuid() . '"></drupal-media>';
     $route_parameters = ['filter_format' => $format->id()];
-    $options = ['query' => ['text' => $text]];
+    $options = [
+      'query' => [
+        'text' => $text,
+        'uuid' => $this->media->uuid(),
+      ],
+    ];
     $this->drupalGet(Url::fromRoute('media.filter.preview', $route_parameters, $options));
 
     $assert_session = $this->assertSession();