diff --git a/typo3/sysext/core/Classes/Error/PageErrorHandler/PageContentErrorHandler.php b/typo3/sysext/core/Classes/Error/PageErrorHandler/PageContentErrorHandler.php index c34df19227b309d2525858e891a872a06ac595bf..1d23a735b63e6c65d7774c6a30160138cc47341c 100644 --- a/typo3/sysext/core/Classes/Error/PageErrorHandler/PageContentErrorHandler.php +++ b/typo3/sysext/core/Classes/Error/PageErrorHandler/PageContentErrorHandler.php @@ -120,7 +120,7 @@ class PageContentErrorHandler implements PageErrorHandlerInterface /** @var SiteLanguage $requestLanguage */ $requestLanguage = $request->getAttribute('language', null); // Try to get the current request language from the site that was found above - if ($requestLanguage instanceof SiteLanguage) { + if ($requestLanguage instanceof SiteLanguage && $requestLanguage->isEnabled()) { try { $language = $site->getLanguageById($requestLanguage->getLanguageId()); } catch (\InvalidArgumentException $e) {