diff --git a/src/EventListener/AdminRouterSubscriber.php b/src/EventListener/AdminRouterSubscriber.php
index 5ac2da04e0..c3f3430d16 100644
--- a/src/EventListener/AdminRouterSubscriber.php
+++ b/src/EventListener/AdminRouterSubscriber.php
@@ -172,11 +172,13 @@ public function onKernelRequest(RequestEvent $event): void
             }
 
             $prettyUrlRoute = $this->adminRouteGenerator->findRouteName($dashboardControllerFqcn, $crudControllerFqcn, $request->query->get(EA::CRUD_ACTION, ''));
-            $request->query->remove(EA::CRUD_CONTROLLER_FQCN);
+            if (null !== $prettyUrlRoute) {
+                $request->query->remove(EA::CRUD_CONTROLLER_FQCN);
 
-            $event->setResponse(new RedirectResponse($this->urlGenerator->generate($prettyUrlRoute, $request->query->all())));
+                $event->setResponse(new RedirectResponse($this->urlGenerator->generate($prettyUrlRoute, $request->query->all())));
 
-            return;
+                return;
+            }
         }
 
         if (null === $dashboardControllerInstance = $this->getDashboardControllerInstance($dashboardControllerFqcn, $request)) {