diff --git a/services/web/app/coffee/Features/Compile/CompileController.coffee b/services/web/app/coffee/Features/Compile/CompileController.coffee
index 8db4ee9251..68c8479f04 100755
--- a/services/web/app/coffee/Features/Compile/CompileController.coffee
+++ b/services/web/app/coffee/Features/Compile/CompileController.coffee
@@ -17,8 +17,8 @@ module.exports = CompileController =
 		AuthenticationController.getLoggedInUserId req, (error, user_id) ->
 			return next(error) if error?
 			UserGetter.getUser user_id, {"features.compileGroup":1, "features.compileTimeout":1}, (err, user)->
-				settingsOverride.timeout = user.features.compileTimeout
-				settingsOverride.compiler = user.features.compileGroup
+				settingsOverride.timeout = user.features.compileTimeout || Settings.defaultFeatures.compileTimeout
+				settingsOverride.compiler = user.features.compileGroup || Settings.defaultFeatures.compileGroup
 				CompileManager.compile project_id, user_id, { isAutoCompile, settingsOverride }, (error, status, outputFiles) ->
 					return next(error) if error?
 					res.contentType("application/json")