diff --git a/cp/app/Controllers/DomainsController.php b/cp/app/Controllers/DomainsController.php
index 49b401a..9bd13c4 100644
--- a/cp/app/Controllers/DomainsController.php
+++ b/cp/app/Controllers/DomainsController.php
@@ -1070,6 +1070,8 @@ class DomainsController extends Controller
                 if (strpos($domain['name'], 'xn--') === 0) {
                     $domain['punycode'] = $domain['name'];
                     $domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                } else {
+                    $domain['punycode'] = $domain['name'];
                 }
                 return view($response,'admin/domains/updateDomain.twig', [
                     'domain' => $domain,
@@ -1899,6 +1901,8 @@ class DomainsController extends Controller
                 if (strpos($domain['name'], 'xn--') === 0) {
                     $domain['punycode'] = $domain['name'];
                     $domain['name'] = idn_to_utf8($domain['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                } else {
+                    $domain['punycode'] = $domain['name'];
                 }
                 return view($response,'admin/domains/renewDomain.twig', [
                     'domain' => $domain,
diff --git a/cp/app/Controllers/HostsController.php b/cp/app/Controllers/HostsController.php
index 3db7dbb..6a2d98a 100644
--- a/cp/app/Controllers/HostsController.php
+++ b/cp/app/Controllers/HostsController.php
@@ -388,6 +388,8 @@ class HostsController extends Controller
                     if (strpos($host['name'], 'xn--') === 0) {
                         $host['punycode'] = $host['name'];
                         $host['name'] = idn_to_utf8($host['name'], IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+                    } else {
+                        $host['punycode'] = $host['name'];
                     }
                     return view($response,'admin/hosts/updateHost.twig', [
                         'host' => $host,