diff --git a/libraries/classes/Application.php b/libraries/classes/Application.php
index ad9c68badd..0117b33863 100644
--- a/libraries/classes/Application.php
+++ b/libraries/classes/Application.php
@@ -22,6 +22,7 @@ use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Identifiers\DatabaseName;
 use PhpMyAdmin\Identifiers\TableName;
 use PhpMyAdmin\Middleware\ConfigLoading;
+use PhpMyAdmin\Middleware\EncryptedQueryParamsHandling;
 use PhpMyAdmin\Middleware\ErrorHandling;
 use PhpMyAdmin\Middleware\OutputBuffering;
 use PhpMyAdmin\Middleware\PhpExtensionsChecking;
@@ -96,6 +97,7 @@ class Application
             $this->template,
             $this->responseFactory,
         ));
+        $requestHandler->add(new EncryptedQueryParamsHandling());
 
         $runner = new RequestHandlerRunner(
             $requestHandler,
@@ -121,8 +123,6 @@ class Application
         $route = $request->getRoute();
         $isMinimumCommon = $isSetupPage || $route === '/import-status' || $route === '/url' || $route === '/messages';
 
-        $request = Core::populateRequestWithEncryptedQueryParams($request);
-
         $container = Core::getContainerBuilder();
 
         /**
diff --git a/libraries/classes/Middleware/EncryptedQueryParamsHandling.php b/libraries/classes/Middleware/EncryptedQueryParamsHandling.php
new file mode 100644
index 0000000000..8f1bf88e0f
--- /dev/null
+++ b/libraries/classes/Middleware/EncryptedQueryParamsHandling.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Middleware;
+
+use PhpMyAdmin\Core;
+use PhpMyAdmin\Http\ServerRequest;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+use function assert;
+
+final class EncryptedQueryParamsHandling implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        assert($request instanceof ServerRequest);
+        $request = Core::populateRequestWithEncryptedQueryParams($request);
+
+        return $handler->handle($request);
+    }
+}