diff --git a/src/apptask.js b/src/apptask.js
index 3ff2b1f8e..64abf96e1 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -769,7 +769,6 @@ function configure(app, args, progressCallback, callback) {
     assert.strictEqual(typeof callback, 'function');
 
     const oldConfig = args.oldConfig || {}; // this can be null in repair cases
-    const locationChanged = oldConfig.fqdn !== app.fqdn;
 
     async.series([
         progressCallback.bind(null, { percent: 10, message: 'Cleaning up old install' }),
@@ -779,11 +778,13 @@ function configure(app, args, progressCallback, callback) {
         docker.stopContainers.bind(null, app.id),
         deleteContainers.bind(null, app, { managedOnly: true }),
         function (next) {
+            if (!oldConfig) return next();
+
             let obsoleteDomains = oldConfig.alternateDomains.filter(function (o) {
                 return !app.alternateDomains.some(function (n) { return n.subdomain === o.subdomain && n.domain === o.domain; });
             });
 
-            if (locationChanged) obsoleteDomains.push({ subdomain: oldConfig.location, domain: oldConfig.domain });
+            if (oldConfig.fqdn !== app.fqdn) obsoleteDomains.push({ subdomain: oldConfig.location, domain: oldConfig.domain });
 
             if (obsoleteDomains.length === 0) return next();