diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php
index f83851c9d8f8..ffc6f70b01e9 100644
--- a/app/Http/Controllers/TaskStatusController.php
+++ b/app/Http/Controllers/TaskStatusController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Factory\TaskStatusFactory;
+use App\Filters\TaskStatusFilters;
 use App\Http\Requests\TaskStatus\CreateTaskStatusRequest;
 use App\Http\Requests\TaskStatus\DestroyTaskStatusRequest;
 use App\Http\Requests\TaskStatus\ShowTaskStatusRequest;
@@ -74,9 +75,9 @@ class TaskStatusController extends BaseController
      *       ),
      *     )
      */
-    public function index()
+    public function index(TaskStatusFilters $filters)
     {
-        $task_status = TaskStatus::whereCompanyId(auth()->user()->company()->id)->orWhere('company_id', null);
+        $task_status = TaskStatus::filter($filters);
 
         return $this->listResponse($task_status);
     }
diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php
index 0b08cd792775..1b5c65d4e65e 100644
--- a/app/Models/TaskStatus.php
+++ b/app/Models/TaskStatus.php
@@ -11,6 +11,7 @@
 
 namespace App\Models;
 
+use App\Models\Filterable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -19,7 +20,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 class TaskStatus extends BaseModel
 {
     use SoftDeletes;
-
+    use Filterable;
+    
     /**
      * @var bool
      */