diff --git a/src/core/server/graph/tenant/loaders/users.ts b/src/core/server/graph/tenant/loaders/users.ts
index 0b77b370a..c684a9d23 100644
--- a/src/core/server/graph/tenant/loaders/users.ts
+++ b/src/core/server/graph/tenant/loaders/users.ts
@@ -3,7 +3,6 @@ import Context from "talk-server/graph/tenant/context";
 import { retrieveManyUsers, User } from "talk-server/models/user";
 
 export default (ctx: Context) => ({
-  me: ctx.user,
   user: new DataLoader<string, User | null>(ids =>
     retrieveManyUsers(ctx.mongo, ctx.tenant.id, ids)
   ),
diff --git a/src/core/server/graph/tenant/resolvers/query.ts b/src/core/server/graph/tenant/resolvers/query.ts
index 74362011f..295b6c459 100644
--- a/src/core/server/graph/tenant/resolvers/query.ts
+++ b/src/core/server/graph/tenant/resolvers/query.ts
@@ -5,7 +5,7 @@ const Query: GQLQueryTypeResolver<void> = {
   comment: (source, { id }, ctx) =>
     id ? ctx.loaders.Comments.comment.load(id) : null,
   settings: (source, args, ctx) => ctx.tenant,
-  me: (source, args, ctx) => ctx.loaders.Users.me,
+  me: (source, args, ctx) => ctx.user,
 };
 
 export default Query;
diff --git a/src/core/server/graph/tenant/resolvers/user.ts b/src/core/server/graph/tenant/resolvers/user.ts
index 2458f26f2..97763ab82 100644
--- a/src/core/server/graph/tenant/resolvers/user.ts
+++ b/src/core/server/graph/tenant/resolvers/user.ts
@@ -2,8 +2,7 @@ import { GQLUserTypeResolver } from "talk-server/graph/tenant/schema/__generated
 import { User } from "talk-server/models/User";
 
 const User: GQLUserTypeResolver<User> = {
-  comments: (_, input, ctx) =>
-    ctx.user ? ctx.loaders.Comments.forUser(ctx.user.id, input) : [],
+  comments: (user, input, ctx) => ctx.loaders.Comments.forUser(user.id, input),
 };
 
 export default User;
diff --git a/src/core/server/graph/tenant/schema/schema.graphql b/src/core/server/graph/tenant/schema/schema.graphql
index e8f4cc42f..cf5e0c40c 100644
--- a/src/core/server/graph/tenant/schema/schema.graphql
+++ b/src/core/server/graph/tenant/schema/schema.graphql
@@ -554,7 +554,7 @@ type User {
     first: Int = 10
     orderBy: COMMENT_SORT = CREATED_AT_DESC
     after: Cursor
-  ): CommentsConnection!
+  ): CommentsConnection! @auth(roles: [ADMIN, MODERATOR], userIDField: "id")
 }
 
 ################################################################################