diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 964bb74..f7801a6 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -134,6 +134,8 @@ class DashboardController extends ResourceController
                                 ->join('partner_staff ps', 'ps.id = pe.assigned_to', 'left')
                                 ->where('pe.manager_id', $manager_id)
                                 ->where('pe.is_active', 1)
+                                ->where('pe.assigned_to IS NOT NULL')
+                                ->where('pe.assigned_to !=', 0)
                                 ->groupBy('pe.assigned_to')
                                 ->orderBy('ps.name', 'ASC')
                                 ->get()
@@ -209,6 +211,8 @@ class DashboardController extends ResourceController
                                     ->where("JSON_CONTAINS(ps.handler_id, '\"$handler_id\"')")
                                     // ->where('ps.handler_id', $handler_id)
                                     ->where('pe.is_active', 1)
+                                    ->where('pe.assigned_to IS NOT NULL')
+                                    ->where('pe.assigned_to !=', 0)
                                     ->groupBy('pe.assigned_to')
                                     ->orderBy('ps.name', 'ASC')
                                     ->get()