diff --git a/server/api/documents.js b/server/api/documents.js
index 5c8e3d7b..b43ba923 100644
--- a/server/api/documents.js
+++ b/server/api/documents.js
@@ -5,10 +5,9 @@ import httpErrors from 'http-errors';
 import auth from './middlewares/authentication';
 import pagination from './middlewares/pagination';
 import { presentDocument } from '../presenters';
-import { Document, Collection, Star, View } from '../models';
+import { User, Document, Collection, Star, View } from '../models';
 
 const router = new Router();
-
 router.post('documents.list', auth(), pagination(), async ctx => {
   let { sort = 'updatedAt', direction } = ctx.body;
   if (direction !== 'ASC') direction = 'DESC';
@@ -19,6 +18,7 @@ router.post('documents.list', auth(), pagination(), async ctx => {
     order: [[sort, direction]],
     offset: ctx.state.pagination.offset,
     limit: ctx.state.pagination.limit,
+    include: [{ model: Star, as: 'starred', where: { userId: user.id } }],
   });
 
   let data = await Promise.all(documents.map(doc => presentDocument(ctx, doc)));
@@ -60,7 +60,12 @@ router.post('documents.starred', auth(), pagination(), async ctx => {
   const views = await Star.findAll({
     where: { userId: user.id },
     order: [[sort, direction]],
-    include: [{ model: Document }],
+    include: [
+      {
+        model: Document,
+        include: [{ model: Star, as: 'starred', where: { userId: user.id } }],
+      },
+    ],
     offset: ctx.state.pagination.offset,
     limit: ctx.state.pagination.limit,
   });
diff --git a/server/models/Document.js b/server/models/Document.js
index f0f5e900..82b5c439 100644
--- a/server/models/Document.js
+++ b/server/models/Document.js
@@ -115,7 +115,31 @@ const Document = sequelize.define(
     },
     classMethods: {
       associate: models => {
-        Document.belongsTo(models.User);
+        Document.belongsTo(models.Collection, {
+          foreignKey: 'atlasId',
+        });
+        Document.belongsTo(models.User, {
+          as: 'createdBy',
+          foreignKey: 'createdById',
+        });
+        Document.belongsTo(models.User, {
+          as: 'updatedBy',
+          foreignKey: 'lastModifiedById',
+        });
+        Document.hasMany(models.Star, {
+          as: 'starred',
+        });
+        Document.addScope(
+          'defaultScope',
+          {
+            include: [
+              { model: models.Collection },
+              { model: models.User, as: 'createdBy' },
+              { model: models.User, as: 'updatedBy' },
+            ],
+          },
+          { override: true }
+        );
       },
       findById: async id => {
         if (isUUID(id)) {
diff --git a/server/presenters/document.js b/server/presenters/document.js
index 8757ed7e..124f8650 100644
--- a/server/presenters/document.js
+++ b/server/presenters/document.js
@@ -1,8 +1,9 @@
-import { Collection, Star, User, View } from '../models';
+// @flow
+import { Star, User, Document, View } from '../models';
 import presentUser from './user';
 import presentCollection from './collection';
 
-async function present(ctx, document, options) {
+async function present(ctx: Object, document: Document, options: Object = {}) {
   options = {
     includeCollection: true,
     includeCollaborators: true,
@@ -10,8 +11,6 @@ async function present(ctx, document, options) {
     ...options,
   };
   ctx.cache.set(document.id, document);
-
-  const userId = ctx.state.user.id;
   const data = {
     id: document.id,
     url: document.getUrl(),
@@ -20,37 +19,23 @@ async function present(ctx, document, options) {
     text: document.text,
     html: document.html,
     preview: document.preview,
+    collection: presentCollection(ctx, document.collection),
     createdAt: document.createdAt,
-    createdBy: undefined,
+    createdBy: presentUser(ctx, document.createdBy),
     updatedAt: document.updatedAt,
-    updatedBy: undefined,
+    updatedBy: presentUser(ctx, document.updatedBy),
     team: document.teamId,
     collaborators: [],
+    starred: !!document.starred,
+    views: undefined,
   };
 
-  data.starred = !!await Star.findOne({
-    where: { documentId: document.id, userId },
-  });
-
   if (options.includeViews) {
     data.views = await View.sum('count', {
       where: { documentId: document.id },
     });
   }
 
-  if (options.includeCollection) {
-    data.collection = await ctx.cache.get(document.atlasId, async () => {
-      const collection =
-        options.collection ||
-        (await Collection.findOne({
-          where: {
-            id: document.atlasId,
-          },
-        }));
-      return presentCollection(ctx, collection);
-    });
-  }
-
   if (options.includeCollaborators) {
     // This could be further optimized by using ctx.cache
     data.collaborators = await User.findAll({
@@ -62,18 +47,6 @@ async function present(ctx, document, options) {
     }).map(user => presentUser(ctx, user));
   }
 
-  const createdBy = await ctx.cache.get(
-    document.createdById,
-    async () => await User.findById(document.createdById)
-  );
-  data.createdBy = await presentUser(ctx, createdBy);
-
-  const updatedBy = await ctx.cache.get(
-    document.lastModifiedById,
-    async () => await User.findById(document.lastModifiedById)
-  );
-  data.updatedBy = await presentUser(ctx, updatedBy);
-
   return data;
 }