diff --git a/services/web/app/coffee/Features/FileStore/FileStoreHandler.coffee b/services/web/app/coffee/Features/FileStore/FileStoreHandler.coffee
index ba1bb5b3dc..190c67c8f6 100644
--- a/services/web/app/coffee/Features/FileStore/FileStoreHandler.coffee
+++ b/services/web/app/coffee/Features/FileStore/FileStoreHandler.coffee
@@ -13,7 +13,7 @@ module.exports =
 			uri: @_buildUrl(project_id, file_id)
 		writeStream = request(opts)
 		readStream.pipe writeStream
-		readStream.on "end", callback
+		writeStream.on "end", callback
 		readStream.on "error", (err)->
 			logger.err err:err, project_id:project_id, file_id:file_id, fsPath:fsPath, "something went wrong on the read stream of uploadFileFromDisk"
 			callback err
diff --git a/services/web/test/UnitTests/coffee/FileStore/FileStoreHandlerTests.coffee b/services/web/test/UnitTests/coffee/FileStore/FileStoreHandlerTests.coffee
index 102d9c135c..2a82ba944f 100644
--- a/services/web/test/UnitTests/coffee/FileStore/FileStoreHandlerTests.coffee
+++ b/services/web/test/UnitTests/coffee/FileStore/FileStoreHandlerTests.coffee
@@ -10,7 +10,11 @@ describe "FileStoreHandler", ->
 	beforeEach ->
 		@fs =
 			createReadStream : sinon.stub()
-		@writeStream = {my:"writeStream", on:->}
+		@writeStream =
+			my:"writeStream"
+			on: (type, cb)-> 
+				if type == "end"
+					cb()
 		@readStream = {my:"readStream"}
 		@request = sinon.stub()
 		@settings = apis:{filestore:{url:"http//filestore.sharelatex.test"}}