diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 344527210..73e2b5fd6 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -67,8 +67,11 @@ class SoongWorkflowCommentWizard(models.TransientModel):
 
     @api.onchange('is_selection')
     def _onchange_is_selection(self):
+        domain = [('id', 'in', self.employee_ids1.ids)]
         if self.is_selection:
-            all_employees = self.env['hr.employee'].search([('id', 'in', self.employee_ids1.ids)])
+            if self.is_this_company:
+                domain.append(('company_id', '=', self.company_id.id))
+            all_employees = self.env['hr.employee'].search(domain)
             self.employee_ids = all_employees
         else:
             self.employee_ids = False