diff --git a/.github/workflows/thank-you.yml b/.github/workflows/thank-you.yml
index 192f71d1a64..10f2f9211da 100644
--- a/.github/workflows/thank-you.yml
+++ b/.github/workflows/thank-you.yml
@@ -33,11 +33,11 @@ jobs:
 
             const { assignees, user } = result.data
 
-            const assignees_tagged = assignees.map((user) => '@' + user.login).join(' ')
-            const owner_tagged = '@' + user.login
+            const taggedUsers = assignees.length > 0 
+              ? assignees.map((u) => '@' + u.login).join(' ') 
+              : '@' + user.login;
 
-            if (assignees.length == 0) {
-              await github.rest.issues.createComment({ ...options, body: `${owner_tagged} ${thankyouNote}` })
-            } else {
-              await github.rest.issues.createComment({ ...options, body: `${assignees_tagged} ${owner_tagged} ${thankyouNote}` })
-            }
+            await github.rest.issues.createComment({ 
+              ...options, 
+              body: `${taggedUsers} ${thankyouNote}` 
+            });