diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 4510054..1348e27 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -94,7 +94,7 @@ final class ApiController extends Controller
         $doc->setDoc(Markdown::parse((string) ($request->getData('plain') ?? '')));
         $doc->setDocRaw((string) ($request->getData('plain') ?? ''));
         $doc->setCategory(new NullWikiCategory((int) ($request->getData('category') ?? 1)));
-        $doc->setLanguage((string) ($request->getData('language') ?? $request->getHeader()->getL11n()->getLanguage()));
+        $doc->setLanguage((string) ($request->getData('language') ?? $request->getLanguage()));
         $doc->setStatus((int) ($request->getData('status') ?? WikiStatus::INACTIVE));
         $doc->setApp(new NullWikiApp((int) ($request->getData('app') ?? 1)));
 
@@ -205,7 +205,7 @@ final class ApiController extends Controller
         $l11nWikiCategory = new WikiCategoryL11n();
         $l11nWikiCategory->setCategory((int) ($request->getData('category') ?? 0));
         $l11nWikiCategory->setLanguage((string) (
-            $request->getData('language') ?? $request->getHeader()->getL11n()->getLanguage()
+            $request->getData('language') ?? $request->getLanguage()
         ));
         $l11nWikiCategory->setName((string) ($request->getData('name') ?? ''));
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 331eaa7..ffac8b6 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -82,10 +82,10 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-dashboard');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response));
 
-        $categories = WikiCategoryMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::getByParentAndApp($request->hasData('category') ? (int) $request->getData('category') : null, $app, 2);
+        $categories = WikiCategoryMapper::withConditional('language', $response->getLanguage())::getByParentAndApp($request->hasData('category') ? (int) $request->getData('category') : null, $app, 2);
         $view->setData('categories', $categories);
 
-        $documents = WikiDocMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::getNewestByApp($app, 10);
+        $documents = WikiDocMapper::withConditional('language', $response->getLanguage())::getNewestByApp($app, 10);
         $view->setData('docs', $documents);
 
         $apps = WikiAppMapper::getAll();
@@ -284,7 +284,7 @@ final class BackendController extends Controller
         $view = new View($this->app->l11nManager, $request, $response);
 
         $app  = (int) ($request->getData('app') ?? $this->app->orgId);
-        $lang = $response->getHeader()->getL11n()->getLanguage();
+        $lang = $response->getLanguage();
 
         $document  = WikiDocMapper::withConditional('language', $lang)::get((int) $request->getData('id'));
         $accountId = $request->getHeader()->getAccount();