diff --git a/src/apps.js b/src/apps.js
index 71ff61d87..7e4683e10 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -1169,7 +1169,7 @@ function setDataDir(appId, dataDir, auditSource, callback) {
         error = validateDataDir(dataDir);
         if (error) return callback(error);
 
-        scheduleTask(appId, { oldConfig: getAppConfig(app) }, { installationState: exports.ISTATE_PENDING_DATA_DIR_MIGRATION, dataDir: dataDir }, function (error, result) {
+        scheduleTask(appId, { oldDataDir: app.dataDir }, { installationState: exports.ISTATE_PENDING_DATA_DIR_MIGRATION, dataDir: dataDir }, function (error, result) {
             if (error) return callback(error);
 
             eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId, app: app, dataDir: dataDir, taskId: result.taskId });
diff --git a/src/apptask.js b/src/apptask.js
index 6e140aa9f..272f20520 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -692,13 +692,13 @@ function changeLocation(app, oldConfig, progressCallback, callback) {
     });
 }
 
-function migrateDataDir(app, oldConfig, progressCallback, callback) {
+function migrateDataDir(app, oldDataDir, progressCallback, callback) {
     assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof oldConfig, 'object');
+    assert.strictEqual(typeof oldDataDir, 'string');
     assert.strictEqual(typeof progressCallback, 'function');
     assert.strictEqual(typeof callback, 'function');
 
-    const dataDirChanged = oldConfig.dataDir !== app.dataDir;
+    const dataDirChanged = oldDataDir !== app.dataDir;
 
     async.series([
         progressCallback.bind(null, { percent: 10, message: 'Cleaning up old install' }),
@@ -716,7 +716,7 @@ function migrateDataDir(app, oldConfig, progressCallback, callback) {
         function (next) {
             if (!dataDirChanged) return next();
 
-            moveDataDir(app, oldConfig.dataDir, next);
+            moveDataDir(app, oldDataDir, next);
         },
 
         progressCallback.bind(null, { percent: 60, message: 'Creating container' }),
@@ -1028,7 +1028,7 @@ function run(appId, args, progressCallback, callback) {
         case apps.ISTATE_PENDING_DEBUG:
             return create(app, progressCallback, callback);
         case apps.ISTATE_PENDING_LOCATION_CHANGE: return changeLocation(app, args.oldConfig, progressCallback, callback);
-        case apps.ISTATE_PENDING_DATA_DIR_MIGRATION: return migrateDataDir(app, args.oldConfig, progressCallback, callback);
+        case apps.ISTATE_PENDING_DATA_DIR_MIGRATION: return migrateDataDir(app, args.oldDataDir, progressCallback, callback);
         case apps.ISTATE_PENDING_UNINSTALL: return uninstall(app, progressCallback, callback);
         case apps.ISTATE_PENDING_CLONE: return install(app, args.restoreConfig || {}, progressCallback, callback);
         case apps.ISTATE_PENDING_RESTORE: return install(app, args.restoreConfig || {}, progressCallback, callback);