diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 7d29e7868271..b1594a62761f 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -167,12 +167,11 @@ class ClientFilters extends QueryFilters
         return $query;
     }
 
-     public function company()
-        {
-            $entity = strtolower(class_basename(Client::class));
+     public function entityFilter()
+    {
+        
+        return $this->builder->whereCompanyId(auth()->user()->company()->id);
 
-            $this->builder->where($entity .'.company_id', '=', auth()->user()->company()->id);
-
-        }
+    }
 
 }
\ No newline at end of file
diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index be5ae418f33e..e07ca15793d8 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -61,6 +61,8 @@ abstract class QueryFilters
     {
         $this->builder = $builder;
 
+        $this->entityFilter();
+        
         foreach ($this->filters() as $name => $value) {
             if (! method_exists($this, $name)) {
                 continue;