diff --git a/typo3/sysext/frontend/Classes/EidRequestHandler.php b/typo3/sysext/frontend/Classes/EidRequestHandler.php
index 804d768c0260c82de25107f3978fc80505f2f3e6..fc4910ab68e42b483556761afc27b76aa0000563 100644
--- a/typo3/sysext/frontend/Classes/EidRequestHandler.php
+++ b/typo3/sysext/frontend/Classes/EidRequestHandler.php
@@ -46,6 +46,19 @@ class EidRequestHandler implements RequestHandlerInterface {
 	 * @return void
 	 */
 	public function handleRequest() {
+		// Timetracking started
+		$configuredCookieName = trim($GLOBALS['TYPO3_CONF_VARS']['BE']['cookieName']);
+		if (empty($configuredCookieName)) {
+			$configuredCookieName = 'be_typo_user';
+		}
+		if ($_COOKIE[$configuredCookieName]) {
+			$GLOBALS['TT'] = new \TYPO3\CMS\Core\TimeTracker\TimeTracker();
+		} else {
+			$GLOBALS['TT'] = new \TYPO3\CMS\Core\TimeTracker\NullTimeTracker();
+		}
+
+		$GLOBALS['TT']->start();
+
 		// Hook to preprocess the current request
 		if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'])) {
 			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'] as $hookFunction) {
diff --git a/typo3/sysext/frontend/Classes/RequestHandler.php b/typo3/sysext/frontend/Classes/RequestHandler.php
index 85d2ea1090543afd7394b6008bb75fef3e9e7e23..ac01b3a4fe7f893efcb417b1687cfb5a207f4a31 100644
--- a/typo3/sysext/frontend/Classes/RequestHandler.php
+++ b/typo3/sysext/frontend/Classes/RequestHandler.php
@@ -50,16 +50,6 @@ class RequestHandler implements RequestHandlerInterface {
 	 * @return void
 	 */
 	public function handleRequest() {
-		// Hook to preprocess the current request:
-		if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'])) {
-			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'] as $hookFunction) {
-				$hookParameters = array();
-				GeneralUtility::callUserFunction($hookFunction, $hookParameters, $hookParameters);
-			}
-			unset($hookFunction);
-			unset($hookParameters);
-		}
-
 		// Timetracking started
 		$configuredCookieName = trim($GLOBALS['TYPO3_CONF_VARS']['BE']['cookieName']);
 		if (empty($configuredCookieName)) {
@@ -73,6 +63,16 @@ class RequestHandler implements RequestHandlerInterface {
 
 		$GLOBALS['TT']->start();
 
+		// Hook to preprocess the current request:
+		if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'])) {
+			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'] as $hookFunction) {
+				$hookParameters = array();
+				GeneralUtility::callUserFunction($hookFunction, $hookParameters, $hookParameters);
+			}
+			unset($hookFunction);
+			unset($hookParameters);
+		}
+
 		/** @var $GLOBALS['TSFE'] \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController */
 		$GLOBALS['TSFE'] = GeneralUtility::makeInstance(
 			\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class,