diff --git a/Classes/Hooks/TypoScriptFrontendController.php b/Classes/Hooks/TypoScriptFrontendController.php
deleted file mode 100644
index 54b365a43..000000000
--- a/Classes/Hooks/TypoScriptFrontendController.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace DirectMailTeam\DirectMail\Hooks;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use DirectMailTeam\DirectMail\Utility\DmRegistryUtility;
-use TYPO3\CMS\Core\Context\UserAspect;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-
-/**
- * Hooks which is called while FE rendering
- *
- * Class TypoScriptFrontendController
- */
-class TypoScriptFrontendController
-{
-    /**
-     * If a backend user is logged in and
-     * a frontend usergroup is specified in the GET parameters, use this
-     * group to simulate access to an access protected page with content to be sent
-     */
-    public function simulateUsergroup($parameters, \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController $typoScriptFrontendController)
-    {
-        $directMailFeGroup = (int)GeneralUtility::_GET('dmail_fe_group');
-        $accessToken = (string)GeneralUtility::_GET('access_token');
-        if ($directMailFeGroup > 0 && GeneralUtility::makeInstance(DmRegistryUtility::class)->validateAndRemoveAccessToken($accessToken)) {
-            /** @var UserAspect $userAspect */
-            $userAspect = $typoScriptFrontendController->getContext()->getAspect('frontend.user');
-
-            // we reset the content if required
-            if (!in_array($directMailFeGroup, $userAspect->getGroupIds(), true)) {
-                // code was refactor, using a different hook!
-                $typoScriptFrontendController->getContext()->setAspect(
-                    'frontend.user',
-                    new UserAspect($typoScriptFrontendController->fe_user, [$directMailFeGroup])
-                );
-            }
-        }
-    }
-}
diff --git a/Classes/Middleware/SimulateFrontendUserGroup.php b/Classes/Middleware/SimulateFrontendUserGroup.php
new file mode 100644
index 000000000..56f78797e
--- /dev/null
+++ b/Classes/Middleware/SimulateFrontendUserGroup.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DirectMailTeam\DirectMail\Middleware;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use DirectMailTeam\DirectMail\Utility\DmRegistryUtility;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use TYPO3\CMS\Core\Context\Context;
+use TYPO3\CMS\Core\Context\UserAspect;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+class SimulateFrontendUserGroup implements MiddlewareInterface, LoggerAwareInterface
+{
+    use LoggerAwareTrait;
+
+    public function __construct(
+        protected readonly Context $context,
+    ) {}
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $directMailFeGroup = (int)($request->getQueryParams()['dmail_fe_group'] ?? 0);
+        $accessToken = (string)($request->getQueryParams()['access_token'] ?? '');
+
+        if ($directMailFeGroup > 0 && GeneralUtility::makeInstance(DmRegistryUtility::class)->validateAndRemoveAccessToken($accessToken)) {
+            $userAspect = $this->context->getAspect('frontend.user');
+
+            // overwrite 'frontend.user' aspect if required
+            if (!in_array($directMailFeGroup, $userAspect->getGroupIds(), true)) {
+                $frontendUser = $request->getAttribute('frontend.user');
+                $this->context->setAspect(
+                    'frontend.user',
+                    new UserAspect($frontendUser, [$directMailFeGroup]),
+                );
+            }
+        }
+
+        return $handler->handle($request);
+    }
+}
diff --git a/Configuration/RequestMiddlewares.php b/Configuration/RequestMiddlewares.php
index 3d19efa27..41d3fa268 100644
--- a/Configuration/RequestMiddlewares.php
+++ b/Configuration/RequestMiddlewares.php
@@ -8,5 +8,14 @@
                 'friends-of-typo3/jumpurl',
             ],
         ],
+        'direct-mail/simulate-frontend-user-group' => [
+            'target' => \DirectMailTeam\DirectMail\Middleware\SimulateFrontendUserGroup::class,
+            'before' => [
+                'typo3/cms-frontend/tsfe',
+            ],
+            'after' => [
+                'typo3/cms-frontend/authentication',
+            ],
+        ],
     ],
 ];
diff --git a/ext_localconf.php b/ext_localconf.php
index 82177c2e0..f46523f16 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -6,9 +6,6 @@
 
 // https://docs.typo3.org/m/typo3/reference-coreapi/12.4/en-us/ExtensionArchitecture/BestPractises/ConfigurationFiles.html
 (function () {
-    // Register hook for simulating a user group
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['hook_checkEnableFields']['direct_mail'] = 'DirectMailTeam\\DirectMail\\Hooks\\TypoScriptFrontendController->simulateUsergroup';
-
     // Get extension configuration so we can use it here:
     $extConf = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class)->get('direct_mail');