diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php
index 53cb447..e4022cc 100644
--- a/app/Controllers/DashboardController.php
+++ b/app/Controllers/DashboardController.php
@@ -139,6 +139,7 @@ class DashboardController extends ResourceController
                                 ->where('pe.manager_id', $manager_id)
                                 ->where('pe.is_active', 1)
                                 ->where('pe.assigned_to IS NOT NULL')
+                                ->where('ps.name IS NOT NULL')
                                 ->where('pe.assigned_to !=', 0)
                                 ->groupBy('pe.assigned_to')
                                 ->orderBy('ps.name', 'ASC')
@@ -224,9 +225,7 @@ class DashboardController extends ResourceController
 
                                     // ->where('ps.handler_id', $handler_id)
                                     ->where('pe.is_active', 1)
-                                    ->where('ps.is_active', 1)
                                     ->where('pe.assigned_to IS NOT NULL')
-                                    ->where('ps.name IS NOT NULL')
                                     ->where('pe.assigned_to !=', 0)
                                     ->groupBy('pe.assigned_to')
                                     ->orderBy('ps.name', 'ASC')