diff --git a/server.js b/server.js
index 112df2630..a3429f3df 100644
--- a/server.js
+++ b/server.js
@@ -261,13 +261,13 @@ var nt = nThen(function (w) {
         config.store = _store;
     }));
 }).nThen(function (w) {
-    if (!config.enableTaskScheduling) { return; }
     var Tasks = require("./storage/tasks");
     Tasks.create(config, w(function (e, tasks) {
         if (e) {
             throw e;
         }
         config.tasks = tasks;
+        if (config.disableIntegratedTasks) { return; }
         setInterval(function () {
             tasks.runAll(function (err) {
                 if (err) {