diff --git a/app/models/concerns/zone/whois_queryable.rb b/app/models/concerns/zone/whois_queryable.rb
index 970ce87d6..22b2836ec 100644
--- a/app/models/concerns/zone/whois_queryable.rb
+++ b/app/models/concerns/zone/whois_queryable.rb
@@ -36,7 +36,7 @@ module Concerns
           registered: created_at.try(:to_s, :iso8601), status: ['ok (paid and in zone)'],
           changed: updated_at.try(:to_s, :iso8601), email: Setting.registry_email,
           admin_contacts: [contact_vars], tech_contacts: [contact_vars],
-          nameservers: [master_nameserver] }
+          nameservers: nameserver_vars }
       end
 
       def registrar_vars
@@ -54,6 +54,16 @@ module Concerns
         { name: Setting.registry_invoice_contact, email: Setting.registry_email,
           disclosed_attributes: %w[name email] }
       end
+
+      def nameserver_vars
+        vars = []
+        vars.push(master_nameserver)
+        return vars unless ns_records
+
+        ns_records.split("\r\n").each { |ns| (vars << ns) if ns.match? Nameserver::HOSTNAME_REGEXP }
+
+        vars
+      end
     end
   end
 end