diff --git a/app/Controllers/StaffController.php b/app/Controllers/StaffController.php
index d851291..ede1cf0 100644
--- a/app/Controllers/StaffController.php
+++ b/app/Controllers/StaffController.php
@@ -32,7 +32,7 @@ class StaffController extends ResourceController
                 ->whereIn('partner_staff.role_id' , [2,3] )
                 ->findAll();
 
-            }else{
+            }else if(!empty($handler_id)){
 
                 $data = $this->StaffModel->select('partner_staff.* , R.role')
                 ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
@@ -65,7 +65,7 @@ class StaffController extends ResourceController
                                         ->where('partner_staff.is_active' , 1 )
                                         ->findAll();
 
-            }else{
+            }else if(!empty($handler_id)){
 
             $data = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
                                     ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')