diff --git a/lib/new-settings-loader.js b/lib/new-settings-loader.js
index e571d1e2..34826adf 100644
--- a/lib/new-settings-loader.js
+++ b/lib/new-settings-loader.js
@@ -2,12 +2,10 @@ const crypto = require('crypto')
 
 const _ = require('lodash/fp')
 const db = require('./db')
-const migration = require('./config-migration')
 const { asyncLocalStorage } = require('./async-storage')
 const { getOperatorId } = require('./operator')
 const { getTermsConditions, setTermsConditions } = require('./new-config-manager')
 
-const OLD_SETTINGS_LOADER_SCHEMA_VERSION = 1
 const NEW_SETTINGS_LOADER_SCHEMA_VERSION = 2
 const PASSWORD_FILLED = 'PASSWORD_FILLED'
 const SECRET_FIELDS = [
@@ -63,6 +61,10 @@ const notifyReload = (dbOrTx, operatorId) =>
   )
 
 function saveAccounts (accounts) {
+  if (!accounts) {
+    return Promise.resolve()
+  }
+
   const accountsSql = `UPDATE user_config SET data = $1, valid = TRUE, schema_version = $2 WHERE type = 'accounts';
   INSERT INTO user_config (type, data, valid, schema_version)
   SELECT 'accounts', $1, TRUE, $2 WHERE 'accounts' NOT IN (SELECT type FROM user_config)`