diff --git a/services/docstore/app/coffee/DocArchiveManager.coffee b/services/docstore/app/coffee/DocArchiveManager.coffee
index 20514e6194..63c5f780fa 100644
--- a/services/docstore/app/coffee/DocArchiveManager.coffee
+++ b/services/docstore/app/coffee/DocArchiveManager.coffee
@@ -16,12 +16,10 @@ module.exports = DocArchive =
 				return callback(err)
 			else if !docs?
 				return callback new Errors.NotFoundError("No docs for project #{project_id}")
+			docs = _.filter docs, (doc)-> doc.inS3 != true
 			jobs = _.map docs, (doc) ->
-				(cb)-> 
-					if doc.inS3
-						return cb()
-					else
-						DocArchive.archiveDoc project_id, doc, cb
+				(cb)->
+					DocArchive.archiveDoc project_id, doc, cb
 			async.series jobs, callback
 
 
diff --git a/services/docstore/test/unit/coffee/DocArchiveManager.coffee b/services/docstore/test/unit/coffee/DocArchiveManager.coffee
index d566a3448a..d55e870070 100644
--- a/services/docstore/test/unit/coffee/DocArchiveManager.coffee
+++ b/services/docstore/test/unit/coffee/DocArchiveManager.coffee
@@ -168,7 +168,7 @@ describe "DocArchiveManager", ->
 
 			it "should not throw and error", (done)->
 				@DocArchiveManager.archiveAllDocs @project_id, (err)=>
-					err.should.not.exist
+					should.not.exist err
 					done()