diff --git a/Layout/default/Domain/Index.php b/Layout/default/Domain/Index.php
index e080c4b5a..732225bd4 100644
--- a/Layout/default/Domain/Index.php
+++ b/Layout/default/Domain/Index.php
@@ -194,6 +194,10 @@ include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php")
         methods: {
             async showDnsRecordsModal(domain) {
                 this.dnsRecordsModalLoading = domain
+                this.dnsRecordsModal = {
+                    domain: null,
+                    records: []
+                }
                 const response = await axios.get(window['TT_CONFIG']['DOMAIN_API_URL'] + '?do=getDnsRecords&domain=' + domain)
                 this.dnsRecordsModal.domain = domain
                 this.dnsRecordsModal.records = response.data.map(record => {
diff --git a/application/Domain/DomainController.php b/application/Domain/DomainController.php
index ee569e1e5..3fb7671f3 100644
--- a/application/Domain/DomainController.php
+++ b/application/Domain/DomainController.php
@@ -142,7 +142,7 @@ class DomainController extends mfBaseController {
     }
 
     private function getDnsRecords() {
-        if (!isset($this->request->domain)) {
+        if (!empty($this->request->domain)) {
             return ["status" => "error", "message" => "No domain specified."];
         }