diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 6ee687a..8738a4f 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -197,7 +197,7 @@ final class BackendController extends Controller
             $type    = \substr($decoded, 0, $typePos);
         }
 
-        $basePath = __DIR__ . '/../../' . $request->getData('id') . '/Docs/' . $type . '/' . $request->getHeader()->getL11n()->getLanguage();
+        $basePath = __DIR__ . '/../../' . $request->getData('id') . '/Docs/' . $type . '/' . $request->getLanguage();
         $path     = \realpath($basePath . '/' . $page . '.md');
 
         if ($path === false) {
diff --git a/Controller/SearchController.php b/Controller/SearchController.php
index 1cc9d7e..e6c82a0 100755
--- a/Controller/SearchController.php
+++ b/Controller/SearchController.php
@@ -46,8 +46,8 @@ final class SearchController extends Controller
     {
         $lang = 'en';
 
-        if (\is_dir(__DIR__ . '/../Docs/Help/' . $request->getHeader()->getL11n()->getLanguage())) {
-            $lang = $request->getHeader()->getL11n()->getLanguage();
+        if (\is_dir(__DIR__ . '/../Docs/Help/' . $request->getLanguage())) {
+            $lang = $request->getLanguage();
         } elseif (\is_dir(__DIR__ . '/../Docs/Help/' . $this->app->l11nServer->getLanguage())) {
             $lang = $this->app->l11nServer->getLanguage();
         }