diff --git a/src/cron.js b/src/cron.js
index 88ebacab7..7bf9071ac 100644
--- a/src/cron.js
+++ b/src/cron.js
@@ -25,7 +25,6 @@ const appHealthMonitor = require('./apphealthmonitor.js'),
     constants = require('./constants.js'),
     CronJob = require('cron').CronJob,
     debug = require('debug')('box:cron'),
-    directoryServer = require('./directoryserver.js'),
     dyndns = require('./dyndns.js'),
     eventlog = require('./eventlog.js'),
     janitor = require('./janitor.js'),
@@ -174,10 +173,6 @@ async function handleSettingsChanged(key, value) {
         await stopJobs();
         await startJobs();
         break;
-    case settings.DIRECTORY_SERVER_KEY:
-        if (value.enabled) await directoryServer.start();
-        else await directoryServer.stop();
-        break;
     default:
         break;
     }
diff --git a/src/directoryserver.js b/src/directoryserver.js
index 3feca02a3..8ef0cc643 100644
--- a/src/directoryserver.js
+++ b/src/directoryserver.js
@@ -67,6 +67,8 @@ async function applyConfig(config) {
 
     const [error] = await safe(shell.promises.sudo('setLdapAllowlist', [ SET_LDAP_ALLOWLIST_CMD ], {}));
     if (error) throw new BoxError(BoxError.IPTABLES_ERROR, `Error setting ldap allowlist: ${error.message}`);
+
+    if (config.enabled) await start(); else await stop();
 }
 
 // helper function to deal with pagination