diff --git a/BuildServer/lib/tasks/dotnetcompile.js b/BuildServer/lib/tasks/dotnetcompile.js
index e4d9c06..05847e7 100644
--- a/BuildServer/lib/tasks/dotnetcompile.js
+++ b/BuildServer/lib/tasks/dotnetcompile.js
@@ -20,7 +20,7 @@ module.exports = function (params, processor) {
 			return;
 		}
 	} else {
-		if (!settings.ignoreCodeAnalysisByDefault || params.forceCodeAnalysis) {
+		if ((!settings.ignoreCodeAnalysisByDefault && !params.ignoreCodeAnalysis) || params.forceCodeAnalysis) {
 			compileParams.CodeAnalysisRuleSet = settings.codeAnalysisRuleSet;
 		}
 	}