diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index ce11710..f826225 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -117,7 +117,7 @@ final class ApiController extends Controller
         if ($request->hasData('title')) {
             $type->setL11n(
                 $request->getDataString('title') ?? '',
-                $request->getDataString('lang') ?? $request->getLanguage()
+                $request->getDataString('lang') ?? $request->header->l11n->language
             );
         }
 
@@ -188,7 +188,7 @@ final class ApiController extends Controller
         $l11nEditorDocType->ref     = $request->getDataInt('type') ?? 0;
         $l11nEditorDocType->content = $request->getDataString('title') ?? '';
         $l11nEditorDocType->setLanguage(
-            $request->getDataString('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->header->l11n->language
         );
 
         return $l11nEditorDocType;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index e4c5bff..dc8f06f 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -102,7 +102,7 @@ final class BackendController extends Controller
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response));
 
         $path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
-        $docs = EditorDocMapper::getByVirtualPath($path, $request->header->account)->where('tags/title/language', $response->getLanguage())->execute();
+        $docs = EditorDocMapper::getByVirtualPath($path, $request->header->account)->where('tags/title/language', $response->header->l11n->language)->execute();
 
         list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
 
@@ -137,7 +137,7 @@ final class BackendController extends Controller
             ->with('tags/title')
             ->with('media')
             ->where('id', (int) $request->getData('id'))
-            ->where('tags/title/language', $response->getLanguage())
+            ->where('tags/title/language', $response->header->l11n->language)
             ->execute();
 
         $accountId = $request->header->account;
diff --git a/Theme/Api/editor-pdf.tpl.php b/Theme/Api/editor-pdf.tpl.php
index 0bae627..c356641 100644
--- a/Theme/Api/editor-pdf.tpl.php
+++ b/Theme/Api/editor-pdf.tpl.php
@@ -37,7 +37,7 @@ $pdf->setAuthor($this->getData('creator') ?? 'Jingga');
 $pdf->setTitle($this->getData('title') ?? $bill->type->getL11n());
 $pdf->setSubject($this->getData('subtitle') ?? '');
 $pdf->setKeywords(\implode(', ', $this->getData('keywords') ?? []));
-$pdf->language = $bill->getLanguage();
+$pdf->language = $bill->language;
 
 $pdf->attributes['legal_name'] = $this->getData('legal_company_name') ?? 'Jingga e.K.';
 $pdf->attributes['address']    = $this->getData('company_address') ?? 'Gartenstr. 26';