diff --git a/services/docstore/app/coffee/DocArchiveManager.coffee b/services/docstore/app/coffee/DocArchiveManager.coffee
index 52af544df6..ffad78bc4e 100644
--- a/services/docstore/app/coffee/DocArchiveManager.coffee
+++ b/services/docstore/app/coffee/DocArchiveManager.coffee
@@ -11,7 +11,7 @@ thirtySeconds = 30 * 1000
 module.exports = DocArchive =
 
 	archiveAllDocs: (project_id, callback = (err, docs) ->) ->
-		MongoManager.getProjectsDocs project_id, true, (err, docs) ->
+		MongoManager.getProjectsDocs project_id, {include_deleted: true}, (err, docs) ->
 			if err?
 				return callback(err)
 			else if !docs?
diff --git a/services/docstore/app/coffee/DocManager.coffee b/services/docstore/app/coffee/DocManager.coffee
index 6ac4678343..5a6d3961b9 100644
--- a/services/docstore/app/coffee/DocManager.coffee
+++ b/services/docstore/app/coffee/DocManager.coffee
@@ -32,7 +32,7 @@ module.exports = DocManager =
 
 	getAllNonDeletedDocs: (project_id, callback = (error, docs) ->) ->
 		DocArchive.unArchiveAllDocs project_id, (error) ->
-			MongoManager.getProjectsDocs project_id, false, (error, docs) ->
+			MongoManager.getProjectsDocs project_id, {include_deleted: false}, (error, docs) ->
 				if err?
 					return callback(error)
 				else if !docs?
diff --git a/services/docstore/app/coffee/MongoManager.coffee b/services/docstore/app/coffee/MongoManager.coffee
index 13551639d7..2dd5b8b24c 100644
--- a/services/docstore/app/coffee/MongoManager.coffee
+++ b/services/docstore/app/coffee/MongoManager.coffee
@@ -6,9 +6,9 @@ module.exports = MongoManager =
 		db.docs.find {_id: ObjectId(doc_id.toString()), project_id: ObjectId(project_id.toString())}, {}, (error, docs = []) ->
 			callback error, docs[0]
 
-	getProjectsDocs: (project_id, include_deleted, callback)->
+	getProjectsDocs: (project_id, options = {include_deleted: true}, callback)->
 		query = {project_id: ObjectId(project_id.toString())}
-		if !include_deleted
+		if !options.include_deleted
 			query.deleted = { $ne: true }
 		db.docs.find query, {}, callback
 
diff --git a/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee b/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee
index 26c57e7712..ef34901b6a 100644
--- a/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee
+++ b/services/docstore/test/acceptance/coffee/ArchiveDocsTests.coffee
@@ -31,6 +31,9 @@ describe "Archiving all docs", ->
 					DocstoreClient.createDoc @project_id, doc._id, doc.lines, (err)=>
 						doc.lines[0] = doc.lines[0]+" added"
 						DocstoreClient.updateDoc @project_id, doc._id, doc.lines, null, callback
+		# Make sure archiving works on deleted docs too
+		jobs.push (cb) =>
+			DocstoreClient.deleteDoc @project_id, @docs[2]._id, cb
 		async.series jobs, done 
 
 	afterEach (done) ->
@@ -141,10 +144,11 @@ describe "Archiving all docs", ->
 	describe "Unarchiving all docs", ->
 
 		it "should unarchive all the docs", (done) ->
+			non_deleted_docs = @docs.slice(0,2)
 			DocstoreClient.archiveAllDoc @project_id, (error, res) =>
 				DocstoreClient.getAllDocs @project_id, (error, res, docs) =>
 					throw error if error?
-					docs.length.should.equal @docs.length
-					for doc, i in docs
+					docs.length.should.equal non_deleted_docs.length
+					for doc, i in non_deleted_docs
 						doc.lines.should.deep.equal @docs[i].lines
 					done()
diff --git a/services/docstore/test/unit/coffee/DocManagerTests.coffee b/services/docstore/test/unit/coffee/DocManagerTests.coffee
index a932e5dac9..e427ea9e79 100644
--- a/services/docstore/test/unit/coffee/DocManagerTests.coffee
+++ b/services/docstore/test/unit/coffee/DocManagerTests.coffee
@@ -106,7 +106,7 @@ describe "DocManager", ->
 
 			it "should get the project from the database", ->
 				@MongoManager.getProjectsDocs
-					.calledWith(@project_id, false)
+					.calledWith(@project_id, {include_deleted: false})
 					.should.equal true
 
 			it "should return the docs", ->
diff --git a/services/docstore/test/unit/coffee/MongoManagerTests.coffee b/services/docstore/test/unit/coffee/MongoManagerTests.coffee
index 0576da3ddd..d330001e11 100644
--- a/services/docstore/test/unit/coffee/MongoManagerTests.coffee
+++ b/services/docstore/test/unit/coffee/MongoManagerTests.coffee
@@ -43,7 +43,7 @@ describe "MongoManager", ->
 		
 		describe "with included_deleted = false", ->
 			beforeEach -> 
-				@MongoManager.getProjectsDocs @project_id, false, @callback
+				@MongoManager.getProjectsDocs @project_id, include_deleted: false, @callback
 
 			it "should find the non-deleted docs via the project_id", ->
 				@db.docs.find
@@ -58,7 +58,7 @@ describe "MongoManager", ->
 				
 		describe "with included_deleted = true", ->
 			beforeEach -> 
-				@MongoManager.getProjectsDocs @project_id, true, @callback
+				@MongoManager.getProjectsDocs @project_id, include_deleted: true, @callback
 
 			it "should find all via the project_id", ->
 				@db.docs.find