diff --git a/typo3/sysext/scheduler/Classes/Example/TestTask.php b/typo3/sysext/scheduler/Classes/Example/TestTask.php
index 150153fedac02cc403cd3fd605caca8b9e3281bd..dd8e62948f8adb717df499df8666067f91ce76c2 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTask.php
@@ -15,7 +15,6 @@
 
 namespace TYPO3\CMS\Scheduler\Example;
 
-use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\Mime\Address;
 use TYPO3\CMS\Core\Core\Environment;
 use TYPO3\CMS\Core\Mail\FluidEmail;
@@ -54,10 +53,8 @@ class TestTask extends AbstractTask
 
             if (Environment::isCli()) {
                 $calledBy = 'CLI module dispatcher';
-                $site = '-';
             } else {
                 $calledBy = 'TYPO3 backend';
-                $site = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
             }
             $email = GeneralUtility::makeInstance(
                 FluidEmail::class,
@@ -75,7 +72,6 @@ class TestTask extends AbstractTask
                     [
                         'data' => [
                             'uid' => $this->taskUid,
-                            'site' => $site,
                             'calledBy' => $calledBy,
                             'tstamp' => time(),
                             'maxLifetime' => $this->scheduler->extConf['maxLifetime'],
@@ -83,10 +79,6 @@ class TestTask extends AbstractTask
                         'exec' => $this->getExecution()
                     ]
                 );
-
-            if ($GLOBALS['TYPO3_REQUEST'] instanceof ServerRequestInterface) {
-                $email->setRequest($GLOBALS['TYPO3_REQUEST']);
-            }
             GeneralUtility::makeInstance(Mailer::class)->send($email);
             return true;
         }
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.html b/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.html
index fac18d2d26fb07523902e91cd21e12ac52015b94..6605b571aa91eae1ab681e933355ada935d28ea0 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.html
@@ -3,7 +3,6 @@
 <f:section name="Main">
     <strong>UID:</strong> {data.uid}<br>
     <strong>Sitename:</strong> {typo3.sitename}<br>
-    <strong>Site:</strong> {data.site}<br>
     <strong>Called by:</strong> {data.calledBy}<br>
     <strong>Tstamp:</strong> {f:format.date(format:'Y-m-d H:i:s',date:data.tstamp)} [{data.tstamp}]<br>
     <strong>maxLifetime:</strong> {data.maxLifetime}<br>
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.txt b/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.txt
index 7760682519005684e64284e88633a4d112529c8b..85785349f327d285b4919dd115806024fb090663 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.txt
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Email/TestTask.txt
@@ -3,7 +3,6 @@
 <f:section name="Main">
 UID: {data.uid}
 Sitename: {typo3.sitename}
-Site: {data.site}
 Called by: {data.calledBy}
 Tstamp: {f:format.date(format:'Y-m-d H:i:s',date:data.tstamp)} [{data.tstamp}]
 maxLifetime: {data.maxLifetime}