diff --git a/.jshintrc b/.jshintrc
index 74f558f1..e8d605fc 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -31,7 +31,7 @@
 //    "maxparams"     : false,    // {int} Max number of formal params allowed per function
 //    "maxdepth"      : false,    // {int} Max depth of nested blocks (within functions)
 //    "maxstatements" : false,    // {int} Max number statements per function
-//    "maxcomplexity" : 6,    // {int} Max cyclomatic complexity per function
+    "maxcomplexity" : 8,    // {int} Max cyclomatic complexity per function
     "maxlen"        : 120,    // {int} Max number of characters per line
 //
 //    // Relaxing
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 92e04f4a..ff052586 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -547,6 +547,7 @@ module.exports = function(redisPool) {
         );
     };
 
+    // jshint maxcomplexity:10
     /**
      * Whitelist input and get database name & default geometry type from
      * subdomain/user metadata held in CartoDB Redis
diff --git a/lib/cartodb/template_maps.js b/lib/cartodb/template_maps.js
index d7b7f66b..c10bf0f6 100644
--- a/lib/cartodb/template_maps.js
+++ b/lib/cartodb/template_maps.js
@@ -89,6 +89,7 @@ o._redisCmd = function(redisFunc, redisArgs, callback) {
 };
 
 var _reValidIdentifier = /^[a-zA-Z][0-9a-zA-Z_]*$/;
+// jshint maxcomplexity:15
 o._checkInvalidTemplate = function(template) {
   if ( template.version != '0.0.1' ) {
     return new Error("Unsupported template version " + template.version);