diff --git a/bundles/CoreBundle/EventListener/LegacyTemplateListener.php b/bundles/CoreBundle/EventListener/LegacyTemplateListener.php
index 6e90194feb7..c256f3710ad 100644
--- a/bundles/CoreBundle/EventListener/LegacyTemplateListener.php
+++ b/bundles/CoreBundle/EventListener/LegacyTemplateListener.php
@@ -7,6 +7,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
+use Symfony\Component\HttpKernel\Event\KernelEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Templating\EngineInterface;
 
@@ -40,7 +41,7 @@ public function setTemplateEngine(EngineInterface $templateEngine): void
     /**
      * @inheritdoc
      */
-    public function onKernelView(GetResponseForControllerResultEvent $event)
+    public function onKernelView(KernelEvent $event)
     {
 
         /* @var Template $template */
@@ -51,6 +52,10 @@ public function onKernelView(GetResponseForControllerResultEvent $event)
             return;
         }
 
+        if(!$event instanceof GetResponseForControllerResultEvent) {
+            return;
+        }
+
         $parameters = $event->getControllerResult();
         $owner = $template->getOwner();
         list($controller, $action) = $owner;
diff --git a/composer.json b/composer.json
index 7ed2cd31eb1..ed8daf143a6 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
     "presta/sitemap-bundle": "^1.5",
     "ramsey/uuid": "^3.8",
     "sabre/dav": "^3.2",
-    "sensio/framework-extra-bundle": "^5.2",
+    "sensio/framework-extra-bundle": "^5.4",
     "sensiolabs/ansi-to-html": "^1.1",
     "symfony-cmf/routing-bundle": "^2.0",
     "symfony/contracts": "^1.1",