diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go
index dd61e223ed..2b96da7c9e 100644
--- a/store/sqlstore/user_store.go
+++ b/store/sqlstore/user_store.go
@@ -1576,7 +1576,7 @@ func (us SqlUserStore) GetUsersBatchForIndexing(startTime, endTime int64, limit
 
 		var teamMembers []*model.TeamMember
 		teamMembersQuery, args, _ := us.getQueryBuilder().
-			Select("*").
+			Select("TeamId, UserId, Roles, DeleteAt, (SchemeGuest IS NOT NULL AND SchemeGuest) as SchemeGuest, SchemeUser, SchemeAdmin").
 			From("TeamMembers").
 			Where(sq.Eq{"UserId": userIds, "DeleteAt": 0}).
 			ToSql()