diff --git a/lib/graphql/github_users.dart b/lib/graphql/github_users.dart
index 44e21b6..5a3d5ba 100644
--- a/lib/graphql/github_users.dart
+++ b/lib/graphql/github_users.dart
@@ -606,7 +606,13 @@ class GithubUsersQuery extends GraphQLQuery<GithubUsers, GithubUsersArguments> {
                     name: NameNode(value: 'login'),
                     value: VariableNode(name: NameNode(value: 'login')))
               ],
-              directives: [],
+              directives: [
+                DirectiveNode(name: NameNode(value: 'skip'), arguments: [
+                  ArgumentNode(
+                      name: NameNode(value: 'if'),
+                      value: VariableNode(name: NameNode(value: 'isMember')))
+                ])
+              ],
               selectionSet: SelectionSetNode(selections: [
                 FieldNode(
                     name: NameNode(value: 'login'),
@@ -866,16 +872,7 @@ class GithubUsersQuery extends GraphQLQuery<GithubUsers, GithubUsersArguments> {
                           name: NameNode(value: 'after'),
                           value: VariableNode(name: NameNode(value: 'after')))
                     ],
-                    directives: [
-                      DirectiveNode(
-                          name: NameNode(value: 'include'),
-                          arguments: [
-                            ArgumentNode(
-                                name: NameNode(value: 'if'),
-                                value: VariableNode(
-                                    name: NameNode(value: 'isFollowing')))
-                          ])
-                    ],
+                    directives: [],
                     selectionSet: SelectionSetNode(selections: [
                       FieldNode(
                           name: NameNode(value: 'pageInfo'),
diff --git a/lib/graphql/github_users.graphql b/lib/graphql/github_users.graphql
index b60b75d..7152717 100644
--- a/lib/graphql/github_users.graphql
+++ b/lib/graphql/github_users.graphql
@@ -8,7 +8,7 @@ query(
   $isStar: Boolean!
   $isWatch: Boolean!
 ) {
-  user(login: $login) {
+  user(login: $login) @skip(if: $isMember) {
     login
     name
     avatarUrl
@@ -49,7 +49,7 @@ query(
     name
     avatarUrl
     location
-    membersWithRole(first: 30, after: $after) @include(if: $isFollowing) {
+    membersWithRole(first: 30, after: $after) {
       pageInfo {
         hasNextPage
         endCursor