diff --git a/services/track-changes/app/coffee/DocArchiveManager.coffee b/services/track-changes/app/coffee/DocArchiveManager.coffee
index d7b71a8901..de769efa4f 100644
--- a/services/track-changes/app/coffee/DocArchiveManager.coffee
+++ b/services/track-changes/app/coffee/DocArchiveManager.coffee
@@ -24,11 +24,11 @@ module.exports = DocArchiveManager =
 	archiveDocChanges: (project_id, doc_id, callback)->
 		MongoManager.getDocChangesCount doc_id, (error, count) ->
 			if count == 0
-				callback()
+				return callback()
 			else
 				MongoAWS.archiveDocHistory project_id, doc_id, (error) ->
 					logger.log doc_id:doc_id, error: error, "mongoexport"
-					callback()
+					return callback()
 
 	unArchiveAllDocsChanges: (project_id, callback = (error, docs) ->) ->
 		MongoManager.getProjectsDocs project_id, (error, docs) ->
@@ -41,6 +41,10 @@ module.exports = DocArchiveManager =
 			async.series jobs, callback
 
 	unArchiveDocChanges: (project_id, doc_id, callback)->
-		MongoAWS.unArchiveDocHistory project_id, doc_id, (error) ->
-			logger.log doc_id:doc_id, error: error, "mongoimport"
-			callback()
+		MongoManager.getDocChangesCount doc_id, (error, count) ->
+			if count == 0
+				return callback()
+			else
+				MongoAWS.unArchiveDocHistory project_id, doc_id, (error) ->
+					logger.log doc_id:doc_id, error: error, "mongoimport"
+					return callback()
diff --git a/services/track-changes/app/coffee/MongoAWS.coffee b/services/track-changes/app/coffee/MongoAWS.coffee
index 3092209113..9a63ddab4d 100644
--- a/services/track-changes/app/coffee/MongoAWS.coffee
+++ b/services/track-changes/app/coffee/MongoAWS.coffee
@@ -4,15 +4,16 @@ mongoUri = require "mongo-uri";
 logger = require "logger-sharelatex"
 AWS = require 'aws-sdk'
 fs = require 'fs'
+S3S = require 's3-streams'
 
 module.exports = MongoAWS =
 
 	archiveDocHistory: (project_id, doc_id, callback = (error) ->) ->
 		MongoAWS.mongoExportDocHistory doc_id, (error, filepath) ->
-			MongoAWS.s3upload project_id, doc_id, filepath, callback
+			MongoAWS.s3upStream project_id, doc_id, filepath, callback
 
 	unArchiveDocHistory: (project_id, doc_id, callback = (error) ->) ->
-		MongoAWS.s3download project_id, doc_id, (error, filepath) ->
+		MongoAWS.s3downStream project_id, doc_id, (error, filepath) ->
 			if error == null
 				MongoAWS.mongoImportDocHistory filepath, callback
 			else
@@ -74,33 +75,28 @@ module.exports = MongoAWS =
 			else
 				return callback(new Error("mongodump failed: #{stderr}"),null)
 
-	s3upload: (project_id, doc_id, filepath, callback = (error) ->) ->
+	s3upStream: (project_id, doc_id, filepath, callback = (error) ->) ->
 
 		AWS.config.update {
 			accessKeyId: settings.filestore.s3.key
 			secretAccessKey: settings.filestore.s3.secret
 		}
-
-		s3Stream = require('s3-upload-stream')(new AWS.S3());
-
-		upload = s3Stream.upload {
-		  "Bucket": settings.filestore.stores.user_files,
-		  "Key": project_id+"/changes-"+doc_id
+		 
+		upload = S3S.WriteStream new AWS.S3(), {
+			"Bucket": settings.filestore.stores.user_files,
+			"Key": project_id+"/changes-"+doc_id
 		}
 
-		read = fs.createReadStream filepath
+		fs.createReadStream(filepath)
+			.on 'open', (obj) ->
+				return 1
+			.pipe(upload)
+			.on 'finish', () ->
+				return callback(null)
+			.on 'error', (err) ->
+				return callback(err)
 
-		#Handle errors.
-		upload.on 'error', callback
-
-		#Handle upload completion.
-		upload.on 'uploaded', (details) ->
-			return callback(null)
-
-		#Pipe the incoming filestream and up to S3.
-		read.pipe(upload);
-
-	s3download: (project_id, doc_id, callback = (error, filepath) ->) ->
+	s3downStream: (project_id, doc_id, callback = (error, filepath) ->) ->
 
 		filepath = settings.path.dumpFolder + '/' + doc_id + '.jsonDown' 
 
@@ -108,17 +104,17 @@ module.exports = MongoAWS =
 			accessKeyId: settings.filestore.s3.key
 			secretAccessKey: settings.filestore.s3.secret
 		}
-
-		params = {
+		 
+		download = S3S.ReadStream new AWS.S3(), {
 			"Bucket": settings.filestore.stores.user_files,
 			"Key": project_id+"/changes-"+doc_id
 		}
 
-		s3 = new AWS.S3()
-
-		s3.getObject params, (err, data) ->
-			if !err && data.ContentLength > 0
-				fs.writeFile filepath, data.Body, (err) ->
-					return callback(null,filepath)
-			else
-				return callback(new Error("s3download failed: #{err}"),null)
+		download
+			.on 'open', (obj) ->
+				return 1
+			.pipe(fs.createWriteStream(filepath))
+			.on 'finish', () ->
+				return callback(null, filepath)
+			.on 'error', (err) ->
+				return callback(err, null)
diff --git a/services/track-changes/package.json b/services/track-changes/package.json
index 79d2fa1254..f82b618359 100644
--- a/services/track-changes/package.json
+++ b/services/track-changes/package.json
@@ -20,7 +20,7 @@
     "redis": "~0.10.1",
     "underscore": "~1.7.0",
     "mongo-uri": "^0.1.2",
-    "s3-upload-stream": "^1.0.7"
+    "s3-streams": "^0.3.0"
   },
   "devDependencies": {
     "chai": "~1.9.0",