diff --git a/Classes/Domain/Repository/CompanyRepository.php b/Classes/Domain/Repository/CompanyRepository.php
index 964598aca268060f61f10e30e7cc9ba63b0b549f..4b41861353e5b9b44da1405456eb311731be5889 100644
--- a/Classes/Domain/Repository/CompanyRepository.php
+++ b/Classes/Domain/Repository/CompanyRepository.php
@@ -27,6 +27,8 @@ namespace SGalinski\SgJobs\Domain\Repository;
  ***************************************************************/
 
 use SGalinski\SgJobs\Domain\Model\Company;
+use TYPO3\CMS\Core\Context\Context;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 
@@ -57,7 +59,9 @@ class CompanyRepository extends Repository {
 		$query = $this->createQuery();
 		$querySettings = $query->getQuerySettings();
 		$querySettings->setStoragePageIds([$pageUid]);
-		$querySettings->setLanguageUid($GLOBALS['TSFE']->sys_language_uid);
+		$querySettings->setLanguageUid(
+			GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('language', 'id', 0)
+		);
 
 		$query->setQuerySettings($querySettings);
 
@@ -91,7 +95,9 @@ class CompanyRepository extends Repository {
 		$query = $this->createQuery();
 		$querySettings = $query->getQuerySettings();
 		$querySettings->setStoragePageIds([$pageUid]);
-		$querySettings->setLanguageUid($GLOBALS['TSFE']->sys_language_uid);
+		$querySettings->setLanguageUid(
+			GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('language', 'id', 0)
+		);
 
 		$query->setQuerySettings($querySettings);
 
@@ -125,7 +131,9 @@ class CompanyRepository extends Repository {
 		$query = $this->createQuery();
 		$querySettings = $query->getQuerySettings();
 		$querySettings->setStoragePageIds([$pageUid]);
-		$querySettings->setLanguageUid($GLOBALS['TSFE']->sys_language_uid);
+		$querySettings->setLanguageUid(
+			GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('language', 'id', 0)
+		);
 
 		$query->setQuerySettings($querySettings);
 
@@ -159,7 +167,9 @@ class CompanyRepository extends Repository {
 		$query = $this->createQuery();
 		$querySettings = $query->getQuerySettings();
 		$querySettings->setStoragePageIds([$pageUid]);
-		$querySettings->setLanguageUid($GLOBALS['TSFE']->sys_language_uid);
+		$querySettings->setLanguageUid(
+			GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('language', 'id', 0)
+		);
 
 		$query->setQuerySettings($querySettings);