diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 65b930950b67..eeab1a6b581c 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -147,9 +147,6 @@ class BaseController extends Controller
 
         $data = $this->createCollection($query, $transformer, $this->entity_type);
 
-        if(request()->include_static) 
-            $data['static'] = Statics::company(auth()->user()->getCompany()->getLocale());
-        
         return $this->response($data);
 
     }
@@ -195,6 +192,10 @@ class BaseController extends Controller
                 $response['meta'] = $meta;
                 unset($response[$index]['meta']);
             }
+
+            if(request()->include_static) 
+                $response['static'] = Statics::company(auth()->user()->getCompany()->getLocale());
+ 
         }
 
         $response = json_encode($response, JSON_PRETTY_PRINT);
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 6f104dfda9e0..9179573290b9 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -45,7 +45,7 @@ class CompanyUserTransformer extends EntityTransformer
 
     public function transform(CompanyUser $company_user)
     {
-        return ['company_user' => [
+        return [
             'permissions' => $company_user->permissions,
             'settings' => $company_user->settings,
             'is_owner' => (bool) $company_user->is_owner,
@@ -53,7 +53,7 @@ class CompanyUserTransformer extends EntityTransformer
             'is_locked' => (bool) $company_user->is_locked,
             'updated_at' => $company_user->updated_at,
             'deleted_at' => $company_user->deleted_at,
-            ]
+            
         ];
     }
 
diff --git a/tests/Feature/CompanyTest.php b/tests/Feature/CompanyTest.php
index 6ca04817c2e8..5851a37f3601 100644
--- a/tests/Feature/CompanyTest.php
+++ b/tests/Feature/CompanyTest.php
@@ -87,8 +87,6 @@ class CompanyTest extends TestCase
             ]
         )
         ->assertStatus(200)->decodeResponseJson();
-\Log::error($response['data'][0]);
-        //$company = Company::find($this->decodePrimaryKey($response['data']['company_users'][0]['company']['id']));        
         $company = Company::find($this->decodePrimaryKey($response['data'][0]['company']['id']));        
 
         $response = $this->withHeaders([