diff --git a/src/dns/noop.js b/src/dns/noop.js
index c259997d4..239659364 100644
--- a/src/dns/noop.js
+++ b/src/dns/noop.js
@@ -46,8 +46,9 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
     return callback();
 }
 
-function waitForDns(domain, value, type, options, callback) {
+function waitForDns(domain, zoneName, value, type, options, callback) {
     assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
     assert(typeof value === 'string' || util.isRegExp(value));
     assert(type === 'A' || type === 'CNAME' || type === 'TXT');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
diff --git a/src/dns/waitfordns.js b/src/dns/waitfordns.js
index c3f4eeb83..b271d8ae7 100644
--- a/src/dns/waitfordns.js
+++ b/src/dns/waitfordns.js
@@ -60,14 +60,14 @@ function isChangeSynced(domain, value, type, nameserver, callback) {
  }
 
 // check if IP change has propagated to every nameserver
-function waitForDns(domain, value, type, options, callback) {
+function waitForDns(domain, zoneName, value, type, options, callback) {
     assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
     assert(typeof value === 'string' || util.isRegExp(value));
     assert(type === 'A' || type === 'CNAME' || type === 'TXT');
     assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
     assert.strictEqual(typeof callback, 'function');
 
-    var zoneName = tld.getDomain(domain);
     if (typeof value === 'string') {
         // http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
         value = new RegExp('^' + value.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + '$');
diff --git a/src/subdomains.js b/src/subdomains.js
index 8d36a9424..d88b22159 100644
--- a/src/subdomains.js
+++ b/src/subdomains.js
@@ -118,7 +118,7 @@ function waitForDns(domain, value, type, options, callback) {
     settings.getDnsConfig(function (error, dnsConfig) {
         if (error) return callback(new SubdomainError(SubdomainError.INTERNAL_ERROR, error));
 
-        api(dnsConfig.provider).waitForDns(domain, value, type, options, callback);
+        api(dnsConfig.provider).waitForDns(domain, config.zoneName(), value, type, options, callback);
     });
 }