diff --git a/services/web/app/coffee/Features/Compile/ClsiManager.coffee b/services/web/app/coffee/Features/Compile/ClsiManager.coffee
index 4724b770ba..59ce3b4724 100755
--- a/services/web/app/coffee/Features/Compile/ClsiManager.coffee
+++ b/services/web/app/coffee/Features/Compile/ClsiManager.coffee
@@ -99,6 +99,7 @@ module.exports = ClsiManager =
 							compile:
 								options:
 									compiler: project.compiler
+									timeout: settingsOverride.timeout
 								rootResourcePath: rootResourcePath
 								resources: resources
 						}
diff --git a/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee b/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee
index 0fa17ed159..aff181a5ee 100644
--- a/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee
+++ b/services/web/test/UnitTests/coffee/Compile/ClsiManagerTests.coffee
@@ -123,7 +123,7 @@ describe "ClsiManager", ->
 
 		describe "with a valid project", ->
 			beforeEach (done) ->
-				@ClsiManager._buildRequest @project_id, null, (error, request) =>
+				@ClsiManager._buildRequest @project_id, {timeout:100}, (error, request) =>
 					@request = request
 					done()
 
@@ -147,6 +147,7 @@ describe "ClsiManager", ->
 					compile:
 						options:
 							compiler: @compiler
+							timeout : 100
 						rootResourcePath: "main.tex"
 						resources: [{
 							path:    "main.tex"