diff --git a/migrations/20171118000002-domains-add-table.js b/migrations/20171118000002-domains-add-table.js
index 02336235f..4a086c428 100644
--- a/migrations/20171118000002-domains-add-table.js
+++ b/migrations/20171118000002-domains-add-table.js
@@ -1,7 +1,8 @@
 'use strict';
 
 var async = require('async'),
-    safe = require('safetydance');
+    safe = require('safetydance'),
+    tld = require('tldjs');
 
 exports.up = function(db, callback) {
     var fqdn, zoneName, configJson;
@@ -14,8 +15,8 @@ exports.up = function(db, callback) {
                 var domain = {};
                 if (result[0]) domain = safe.JSON.parse(result[0].value) || {};
 
-                fqdn = domain.fqdn || '';
-                zoneName = domain.zoneName || fqdn;
+                fqdn = domain.fqdn || ''; // will be null pre-setup
+                zoneName = domain.zoneName || tld.getDomain(fqdn) || fqdn;
 
                 done();
             });
diff --git a/src/cloudron.js b/src/cloudron.js
index 346d5a459..fb8049e93 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -203,7 +203,7 @@ function dnsSetup(domain, zoneName, provider, dnsConfig, callback) {
 
     if (config.fqdn()) return callback(new CloudronError(CloudronError.ALREADY_SETUP));
 
-    if (!zoneName) zoneName = tld.getDomain(domain) || '';
+    if (!zoneName) zoneName = tld.getDomain(domain) || domain;
 
     debug('dnsSetup: Setting up Cloudron with domain %s and zone %s', domain, zoneName);