diff --git a/server/api/documents.test.js b/server/api/documents.test.js
index 1feac2f4..1dac998d 100644
--- a/server/api/documents.test.js
+++ b/server/api/documents.test.js
@@ -1130,7 +1130,11 @@ describe('#documents.archive', async () => {
     const res = await server.post('/api/documents.archive', {
       body: { token: user.getJwtToken(), id: document.id },
     });
+    const body = await res.json();
+
     expect(res.status).toEqual(200);
+    expect(body.data.updatedBy.id).toEqual(user.id);
+    expect(body.data.archivedAt).toBeTruthy();
   });
 
   it('should require authentication', async () => {
diff --git a/server/models/Document.js b/server/models/Document.js
index dfba75a0..b043b797 100644
--- a/server/models/Document.js
+++ b/server/models/Document.js
@@ -20,7 +20,6 @@ const Markdown = new MarkdownSerializer();
 const URL_REGEX = /^[a-zA-Z0-9-]*-([a-zA-Z0-9]{10,15})$/;
 const DEFAULT_TITLE = 'Untitled document';
 
-// $FlowIssue invalid flow-typed
 slug.defaults.mode = 'rfc3986';
 const slugify = text =>
   slug(text, {
@@ -366,9 +365,6 @@ Document.prototype.archive = async function(userId) {
   await collection.removeDocumentInStructure(this, { save: true });
   this.collection = collection;
 
-  this.archivedAt = new Date();
-  this.lastModifiedById = userId;
-  await this.save();
   await this.archiveWithChildren(userId);
 
   events.add({ name: 'documents.archive', model: this });