diff --git a/src/cloudron.js b/src/cloudron.js
index 323f11d18..e73956c5b 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -88,7 +88,7 @@ const BOX_AND_USER_TEMPLATE = {
 
 var gUpdatingDns = false,                // flag for dns update reentrancy
     gBoxAndUserDetails = null,         // cached cloudron details like region,size...
-    gConfigState = { domain: '', dns: false, tls: false, configured: false };
+    gConfigState = { dns: false, tls: false, configured: false };
 
 function CloudronError(reason, errorOrMessage) {
     assert.strictEqual(typeof reason, 'string');
@@ -236,8 +236,6 @@ function configureAdmin(callback) {
             // skip my.domain.com setup if we don't have a domain
             if (!config.fqdn()) return callback(null);
 
-            gConfigState.domain = config.fqdn();
-
             subdomains.waitForDns(config.adminFqdn(), ip, 'A', { interval: 30000, times: 50000 }, function (error) {
                 if (error) return callback(error);
 
@@ -339,6 +337,7 @@ function getStatus(callback) {
                 apiServerOrigin: config.apiServerOrigin(), // used by CaaS tool
                 provider: config.provider(),
                 cloudronName: cloudronName,
+                adminFqdn: config.fqdn() ? config.adminFqdn() : null,
                 configState: gConfigState
             });
         });
diff --git a/webadmin/src/js/setupdns.js b/webadmin/src/js/setupdns.js
index f0d259e22..828075504 100644
--- a/webadmin/src/js/setupdns.js
+++ b/webadmin/src/js/setupdns.js
@@ -59,8 +59,8 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
         $scope.busy = true;
 
         Client.getStatus(function (error, status) {
-            if (!error && status.configState.domain && status.configState.dns && status.configState.tls) {
-                window.location.href = 'https://my.' + status.configState.domain + '/setup.html';
+            if (!error && status.adminFqdn && status.configState.dns && status.configState.tls) {
+                window.location.href = 'https://my.' + status.adminFqdn + '/setup.html';
             }
 
             setTimeout(waitForDnsSetup, 5000);
@@ -74,7 +74,7 @@ app.controller('SetupDNSController', ['$scope', '$http', 'Client', function ($sc
         }
 
         // domain is currently like a lock flag
-        if (status.configState.domain) return waitForDnsSetup();
+        if (status.adminFqdn) return waitForDnsSetup();
 
         if (status.provider === 'digitalocean') $scope.dnsCredentials.provider = 'digitalocean';