diff --git a/setup/argparser.sh b/setup/argparser.sh
index 3724f2e7e..5b209098a 100644
--- a/setup/argparser.sh
+++ b/setup/argparser.sh
@@ -8,7 +8,6 @@ arg_api_server_origin=""
 arg_fqdn=""
 arg_admin_location=""
 arg_admin_fqdn=""
-arg_zone_name=""
 arg_retire_reason=""
 arg_retire_info=""
 arg_version=""
@@ -33,8 +32,6 @@ while true; do
         # these params must be valid in all cases
         arg_fqdn=$(echo "$2" | $json fqdn)
         arg_admin_fqdn=$(echo "$2" | $json adminFqdn)
-        arg_zone_name=$(echo "$2" | $json zoneName)
-        [[ "${arg_zone_name}" == "" ]] && arg_zone_name="${arg_fqdn}"
 
         arg_admin_location=$(echo "$2" | $json adminLocation)
         [[ "${arg_admin_location}" == "" ]] && arg_admin_location="my"
diff --git a/setup/start.sh b/setup/start.sh
index 344215b30..cac72fd60 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -215,7 +215,6 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
     "fqdn": "${arg_fqdn}",
     "adminFqdn": "${arg_admin_fqdn}",
     "adminLocation": "${arg_admin_location}",
-    "zoneName": "${arg_zone_name}",
     "provider": "${arg_provider}",
     "isDemo": ${arg_is_demo}
 }
diff --git a/src/cloudron.js b/src/cloudron.js
index fb04c2a7e..5e02dada4 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -602,7 +602,6 @@ function doUpdate(boxUpdateInfo, callback) {
             adminFqdn: config.adminFqdn(),
             adminLocation: config.adminLocation(),
             isDemo: config.isDemo(),
-            zoneName: config.zoneName(),
 
             appstore: {
                 apiServerOrigin: config.apiServerOrigin()
diff --git a/src/config.js b/src/config.js
index e71b8a6fc..da938b6c2 100644
--- a/src/config.js
+++ b/src/config.js
@@ -17,7 +17,6 @@ exports = module.exports = {
     apiServerOrigin: apiServerOrigin,
     webServerOrigin: webServerOrigin,
     fqdn: fqdn,
-    zoneName: zoneName,
     setFqdn: setFqdn,
     setAdminFqdn: setAdminFqdn,
     setAdminLocation: setAdminLocation,
@@ -33,7 +32,6 @@ exports = module.exports = {
     adminFqdn: adminFqdn,
     mailLocation: mailLocation,
     mailFqdn: mailFqdn,
-    setZoneName: setZoneName,
     hasIPv6: hasIPv6,
     dkimSelector: dkimSelector,
 
@@ -76,7 +74,6 @@ function saveSync() {
         webServerOrigin: data.webServerOrigin,
         fqdn: data.fqdn,
         adminFqdn: data.adminFqdn,
-        zoneName: data.zoneName,
         adminLocation: data.adminLocation,
         provider: data.provider,
         isDemo: data.isDemo
@@ -97,7 +94,6 @@ function initConfig() {
     // setup defaults
     data.fqdn = '';
     data.adminFqdn = '';
-    data.zoneName = '';
     data.adminLocation = 'my';
     data.port = 3000;
     data.version = null;
@@ -169,18 +165,6 @@ function fqdn() {
     return get('fqdn');
 }
 
-function setZoneName(zone) {
-    set('zoneName', zone);
-}
-
-function zoneName() {
-    var zone = get('zoneName');
-    if (zone) return zone;
-
-    // TODO: move this to migration code path instead
-    return tld.getDomain(fqdn()) || '';
-}
-
 function mailLocation() {
     return get('adminLocation'); // not a typo! should be same as admin location until we figure out certificates
 }