diff --git a/app/Models/Task.php b/app/Models/Task.php
index d2668290e7..43a24cc6f8 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -243,7 +243,7 @@ class Task extends EntityModel
         $taskStatues = TaskStatus::scope()->orderBy('sort_order')->get();
 
         foreach ($taskStatues as $status) {
-            $statuses[$status->id] = $status->name;
+            $statuses[$status->public_id] = $status->name;
         }
 
         if (! $taskStatues->count()) {
diff --git a/app/Ninja/Repositories/TaskRepository.php b/app/Ninja/Repositories/TaskRepository.php
index a7571cc446..54f3582e4b 100644
--- a/app/Ninja/Repositories/TaskRepository.php
+++ b/app/Ninja/Repositories/TaskRepository.php
@@ -89,7 +89,7 @@ class TaskRepository extends BaseRepository
                     $query->orWhere('invoices.balance', '=', 0);
                 }
                 $query->orWhere(function ($query) use ($statuses) {
-                    $query->whereIn('tasks.task_status_id', $statuses)
+                    $query->whereIn('task_statuses.public_id', $statuses)
                         ->whereNull('tasks.invoice_id');
                 });