diff --git a/Classes/Middleware/FrontendUserMiddleware.php b/Classes/Middleware/FrontendUserMiddleware.php
index c0d9c626487..0f4e7307164 100644
--- a/Classes/Middleware/FrontendUserMiddleware.php
+++ b/Classes/Middleware/FrontendUserMiddleware.php
@@ -49,11 +49,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
     protected function weShouldHaveCookie(FrontendUserAuthentication $feUser, ServerRequestInterface $request): bool
     {
-        if ($GLOBALS['TYPO3_REQUEST'] === null) {
-            $GLOBALS['TYPO3_REQUEST'] = $request;
-        }
-
-        $setCookieHeader = $feUser->appendCookieToResponse(new HtmlResponse(''))->getHeaderLine('Set-Cookie');
+        $setCookieHeader = $feUser->appendCookieToResponse(new HtmlResponse(''), $request->getAttribute('normalizedParams'))->getHeaderLine('Set-Cookie');
 
         if (strpos($setCookieHeader, 'Max-Age=0')) {
             // the new cookie is to delete the old cookie: