diff --git a/.github/workflows/label-on-change.yml b/.github/workflows/label-on-change.yml
index d0278d8482..74710934b5 100644
--- a/.github/workflows/label-on-change.yml
+++ b/.github/workflows/label-on-change.yml
@@ -5,9 +5,7 @@ on:
   issues:
     types:
       - assigned
-      - unassigned
       - closed
-      - edited
       - labeled
       - reopened
 
@@ -94,6 +92,19 @@ jobs:
         with:
           labels: 'status: needs-triage'
 
+  on-issue-assigned:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    if: >
+      github.event.action == 'assigned' &&
+      contains(github.event.issue.labels.*.name, 'status: needs-triage')
+    steps:
+      - name: Remove needs-triage label on issue assign
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: 'status: needs-triage'
+
   # on-pr-merge:
   #   runs-on: ubuntu-latest
   #   if: github.event.pull_request.merged == true