diff --git a/app/Http/Controllers/ClientGatewayTokenController.php b/app/Http/Controllers/ClientGatewayTokenController.php
index 33e9a1bd1221..f1b4b4076448 100644
--- a/app/Http/Controllers/ClientGatewayTokenController.php
+++ b/app/Http/Controllers/ClientGatewayTokenController.php
@@ -93,7 +93,7 @@ class ClientGatewayTokenController extends BaseController
      */
     public function index(ListClientGatewayTokenRequest $request)
     {
-        $client_gateway_token_gateway_tokens = ClientGatewayToken::scope();
+        $client_gateway_token_gateway_tokens = ClientGatewayToken::query()->company();
 
         return $this->listResponse($client_gateway_token_gateway_tokens);
     }
diff --git a/app/Http/Requests/ClientGatewayToken/ListClientGatewayTokenRequest.php b/app/Http/Requests/ClientGatewayToken/ListClientGatewayTokenRequest.php
index affe6cc570f9..23542f579d36 100644
--- a/app/Http/Requests/ClientGatewayToken/ListClientGatewayTokenRequest.php
+++ b/app/Http/Requests/ClientGatewayToken/ListClientGatewayTokenRequest.php
@@ -22,6 +22,9 @@ class ListClientGatewayTokenRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth()->user()->isAdmin();
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        return $user->isAdmin();
     }
 }