diff --git a/dnsconfig.js b/dnsconfig.js
index 43658b97f..9ecf43812 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -52,10 +52,15 @@ for (var idx in domains) {
     }
 
     // Handle CNAME records
-    if (domainData.record.CNAME) {
+    if (domainData.record.CNAME && subdomainName !== "@") {
         commit.push(CNAME(subdomainName, domainData.record.CNAME + ".", proxyState));
     }
 
+    // CNAME on root
+    if (subdomainName === "@" && domainData.record.CNAME) {
+        commit.push(ALIAS(subdomainName, domainData.record.CNAME + ".", proxyState));
+    }
+
     // Handle MX records
     if (domainData.record.MX) {
         for (var mx in domainData.record.MX) {