diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index aa8701649..fd1022a57 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -227,6 +227,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                         is_in_scope = True
                         if not btn.is_review_invisible:
                             button = btn
+                            break
                         if btn.is_review_invisible:
                             domain = eval(btn.invisible_expression)
                             model = record_id.env[record_id._name]
@@ -236,9 +237,8 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                             target_btn = btn
                             button = target_btn
                             break
-                if button:
-                    break
-
+        if not button:
+            return self.env['hr.employee']
         link_users_id = button.users_role_id
         link_users_group_ids = button.users_role_group_ids
         is_automatic = button.is_automatic