diff --git a/actions/setup/js/set_issue_field.cjs b/actions/setup/js/set_issue_field.cjs
index 3986845406c..d24119c76b9 100644
--- a/actions/setup/js/set_issue_field.cjs
+++ b/actions/setup/js/set_issue_field.cjs
@@ -35,7 +35,7 @@ async function getIssueNodeId(githubClient, owner, repo, issueNumber) {
 }
 
 /**
- * Fetches available issue fields for the repository/owner.
+ * Fetches available issue fields for the repository.
  * @param {Object} githubClient - Authenticated GitHub client
  * @param {string} owner - Repository owner
  * @param {string} repo - Repository name
@@ -55,21 +55,6 @@ async function fetchIssueFields(githubClient, owner, repo) {
             ... on IssueFieldMultiSelect { id name options { id name } }
           }
         }
-        owner {
-          __typename
-          ... on Organization {
-            issueFields(first: 100) {
-              nodes {
-                __typename
-                ... on IssueFieldText { id name }
-                ... on IssueFieldNumber { id name }
-                ... on IssueFieldDate { id name }
-                ... on IssueFieldSingleSelect { id name options { id name } }
-                ... on IssueFieldMultiSelect { id name options { id name } }
-              }
-            }
-          }
-        }
       }
     }`,
     { owner, repo }
@@ -77,13 +62,7 @@ async function fetchIssueFields(githubClient, owner, repo) {
 
   const isValidNode = node => typeof node?.id === "string" && typeof node?.name === "string";
 
-  const repoFields = (result?.repository?.issueFields?.nodes ?? []).filter(isValidNode);
-  if (repoFields.length > 0) {
-    return repoFields;
-  }
-
-  const ownerFields = (result?.repository?.owner?.issueFields?.nodes ?? []).filter(isValidNode);
-  return ownerFields;
+  return (result?.repository?.issueFields?.nodes ?? []).filter(isValidNode);
 }
 
 /**
diff --git a/actions/setup/js/set_issue_field.test.cjs b/actions/setup/js/set_issue_field.test.cjs
index 9b991ce29f9..75d1a0c626c 100644
--- a/actions/setup/js/set_issue_field.test.cjs
+++ b/actions/setup/js/set_issue_field.test.cjs
@@ -274,10 +274,6 @@ describe("set_issue_field (Handler Factory Architecture)", () => {
         return Promise.resolve({
           repository: {
             issueFields: { nodes: [] },
-            owner: {
-              __typename: "Organization",
-              issueFields: { nodes: [] },
-            },
           },
         });
       }
@@ -349,6 +345,8 @@ describe("set_issue_field (Handler Factory Architecture)", () => {
     await h({ type: "set_issue_field", issue_number: 42, field_name: "Customer Impact", value: "High" }, {});
 
     expect(capturedQuery).not.toContain("... on User");
+    expect(capturedQuery).not.toContain("... on Organization");
+    expect(capturedQuery).not.toMatch(/owner\s*\{/);
   });
 
   it("fetchIssueFields filters out nodes missing id or name (null entries and unknown types)", async () => {
@@ -365,7 +363,6 @@ describe("set_issue_field (Handler Factory Architecture)", () => {
                 { __typename: "IssueFieldUnknown", name: "Orphan" }, // missing id
               ],
             },
-            owner: { __typename: "Organization", issueFields: { nodes: [] } },
           },
         });
       }
diff --git a/actions/setup/js/set_issue_field_api_query.integration.test.cjs b/actions/setup/js/set_issue_field_api_query.integration.test.cjs
index da39dd94284..7585f20cc34 100644
--- a/actions/setup/js/set_issue_field_api_query.integration.test.cjs
+++ b/actions/setup/js/set_issue_field_api_query.integration.test.cjs
@@ -13,21 +13,6 @@ const ISSUE_FIELDS_DISCOVERY_QUERY = `query($owner: String!, $repo: String!) {
         ... on IssueFieldMultiSelect { id name options { id name } }
       }
     }
-    owner {
-      __typename
-      ... on Organization {
-        issueFields(first: 100) {
-          nodes {
-            __typename
-            ... on IssueFieldText { id name }
-            ... on IssueFieldNumber { id name }
-            ... on IssueFieldDate { id name }
-            ... on IssueFieldSingleSelect { id name options { id name } }
-            ... on IssueFieldMultiSelect { id name options { id name } }
-          }
-        }
-      }
-    }
   }
 }`;