diff --git a/frontend/lgproxy.go b/frontend/lgproxy.go
index bab96d6..1e152db 100644
--- a/frontend/lgproxy.go
+++ b/frontend/lgproxy.go
@@ -35,7 +35,11 @@ func batchRequest(servers []string, endpoint string, command string) []string {
 			}(i)
 		} else {
 			// Compose URL and send the request
-			url := "http://" + server + "." + setting.domain + ":" + strconv.Itoa(setting.proxyPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command)
+			hostname := server
+			if setting.domain != "" {
+				hostname += "." + setting.domain
+			}
+			url := "http://" + hostname + ":" + strconv.Itoa(setting.proxyPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command)
 			go func(url string, i int) {
 				response, err := http.Get(url)
 				if err != nil {
diff --git a/frontend/main.go b/frontend/main.go
index 9304ba4..651cf67 100644
--- a/frontend/main.go
+++ b/frontend/main.go
@@ -80,8 +80,6 @@ func main() {
 
 	if *serversPtr == "" {
 		panic("no server set")
-	} else if *domainPtr == "" {
-		panic("no base domain set")
 	}
 
 	setting = settingType{