diff --git a/api/top-langs.js b/api/top-langs.js
index 833396f9..f33df866 100644
--- a/api/top-langs.js
+++ b/api/top-langs.js
@@ -46,7 +46,7 @@ module.exports = async (req, res) => {
     const topLangs = await fetchTopLanguages(
       username,
       parseArray(exclude_repo),
-      parseArray(role).filter(value => ['OWNER', 'ORGANIZATION_MEMBER', 'COLLABORATOR'].includes(value)),
+      parseArray(role),
       parseArray(hide),
     );
 
diff --git a/src/fetchers/top-languages-fetcher.js b/src/fetchers/top-languages-fetcher.js
index 6d5289b1..d3e150f1 100644
--- a/src/fetchers/top-languages-fetcher.js
+++ b/src/fetchers/top-languages-fetcher.js
@@ -3,18 +3,13 @@ const retryer = require("../common/retryer");
 require("dotenv").config();
 
 const fetcher = (variables, token) => {
-  let ownerAffiliations = ["OWNER"];
-  if (variables.ownerAffiliations.length > 0) {
-    ownerAffiliations = variables.ownerAffiliations;
-  }
-  delete variables.ownerAffiliations;
   return request(
     {
       query: `
-      query userInfo($login: String!) {
+      query userInfo($login: String!, $ownerAffiliations: [RepositoryAffiliation]) {
         user(login: $login) {
-          # fetch only owner repos & not forks
-          repositories(ownerAffiliations: [${ownerAffiliations.join(', ')}], isFork: false, first: 100) {
+          # do not fetch forks
+          repositories(ownerAffiliations: $ownerAffiliations, isFork: false, first: 100) {
             nodes {
               name
               languages(first: 10, orderBy: {field: SIZE, direction: DESC}) {