diff --git a/DnsServerCore/WebService.cs b/DnsServerCore/WebService.cs
index 5ed5e787..0b2a8a42 100644
--- a/DnsServerCore/WebService.cs
+++ b/DnsServerCore/WebService.cs
@@ -4443,8 +4443,13 @@ namespace DnsServerCore
 
             try
             {
+                //get initial server domain
+                string serverDomain = Environment.MachineName.ToLower();
+                if (!DnsClient.IsDomainNameValid(serverDomain))
+                    serverDomain = "dns-server-1"; //use this name instead since machine name is not a valid domain name
+
                 //init dns server
-                _dnsServer = new DnsServer(_configFolder, Path.Combine(_appFolder, "dohwww"), _log);
+                _dnsServer = new DnsServer(serverDomain, _configFolder, Path.Combine(_appFolder, "dohwww"), _log);
 
                 //init dhcp server
                 _dhcpServer = new DhcpServer(Path.Combine(_configFolder, "scopes"), _log);