diff --git a/app/Http/Controllers/Api/LanguageController.php b/app/Http/Controllers/Api/LanguageController.php
index 495c9f8e..4f86b78d 100644
--- a/app/Http/Controllers/Api/LanguageController.php
+++ b/app/Http/Controllers/Api/LanguageController.php
@@ -12,40 +12,45 @@ class LanguageController extends Controller
 {
     /**
      * Display a listing of the resource.
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function index(Request $request)
     {
-        return Language::query()
-                       ->select('id', 'name', 'language')
-                       ->orderBy('name')
-                       ->with([
-                           'translations:value,language_id',
-                       ])
-                       ->when(
-                           $request->search,
-                           fn(Builder $query) => $query
-                               ->where('name', 'ilike', "%{$request->search}%")
-                               ->orWhere('language', 'ilike', "%{$request->search}%")
-                       )
-                       ->when(
-                           $request->exists('selected'),
-                           fn(Builder $query) => $query->whereIn('language', $request->input('selected', [])),
-                           fn(Builder $query) => $query->limit(10)
-                       )
-                       ->get()
-                       ->map(function (Language $language) {
-                           $translated = $language->translations->whereNotNull('value')
+        $array = Language::query()
+                         ->select('id', 'name', 'language')
+                         ->orderBy('name')
+                         ->when(
+                             $request->search,
+                             fn(Builder $query) => $query
+                                 ->where('name', 'ilike', "%{$request->search}%")
+                                 ->orWhere('language', 'ilike', "%{$request->search}%")
+                         )
+                         ->when(
+                             $request->exists('selected'),
+                             fn(Builder $query) => $query->whereIn('language', $request->input('selected', [])),
+                             fn(Builder $query) => $query->limit(10)
+                         )
+                         ->get()
+                         ->map(function ($language) {
+                             $language->translatedCount = Translation::query()
+                                                                ->where('language_id', $language['id'])
+                                                                ->whereNotNull('value')
                                                                 ->where('value', '<>', '')
                                                                 ->count();
-                           $toTranslate = Translation::query()
-                                                     ->where('language_id', $language->id)
-                                                     ->count();
-                           $language->name = $language->name ? trans($language->name) : $language->language;
-                           $language->description = $language->language === 'en' ? '100% translated' : round($translated / $toTranslate * 100).'% translated';
+                             $language->toTranslate = Translation::query()
+                                                                 ->where('language_id', $language['id'])
+                                                                 ->count();
+                             return $language;
+                         })
+                         ->toArray();
+        foreach ($array as &$item) {
+            $item['translated'] = __($item['name']);
+            $item['description'] = $item['language'] === 'en'
+                ? __('100% translated')
+                : round($item['translatedCount'] / $item['toTranslate'] * 100).__('% translated');
+        }
 
-                           return $language;
-                       });
+        return response()->json($array);
     }
 
     /**