diff --git a/ajax/networking/get_netcfg.php b/ajax/networking/get_netcfg.php
index f2e735a4..c2710011 100644
--- a/ajax/networking/get_netcfg.php
+++ b/ajax/networking/get_netcfg.php
@@ -21,7 +21,7 @@ if (isset($interface)) {
     $dhcpdata['dhcpHost'] = is_array($dhcpHost) ? $dhcpHost : [ $dhcpHost ];
     $upstreamServers = is_array($conf['server']) ? $conf['server'] : [ $conf['server'] ];
     $dhcpdata['upstreamServers'] = array_filter($upstreamServers);
-
+    $dhcpdata['upstreamServersEnabled'] = empty($conf['server']) ? false: true;
     preg_match('/([0-9]*)([a-z])/i', $dhcpdata['leaseTime'], $arrRangeLeaseTime);
     $dhcpdata['leaseTime'] = $arrRangeLeaseTime[1];
     $dhcpdata['leaseTimeInterval'] = $arrRangeLeaseTime[2];
diff --git a/app/js/custom.js b/app/js/custom.js
index 0d8ce7f6..38d8e9f9 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -255,6 +255,8 @@ function loadInterfaceDHCPSelect() {
         $('#txtdns1').val(jsonData.DNS1);
         $('#txtdns2').val(jsonData.DNS2);
         $('#cbxrangeleasetimeunits').val(jsonData.leaseTimeInterval);
+        $('#no-resolv')[0].checked = jsonData.upstreamServersEnabled;
+        $('#cbxdhcpupstreamserver').val(jsonData.upstreamServers[0]);
     });
 }
 
diff --git a/templates/dhcp/advanced.php b/templates/dhcp/advanced.php
index fda2eb00..69804d86 100644
--- a/templates/dhcp/advanced.php
+++ b/templates/dhcp/advanced.php
@@ -41,7 +41,7 @@
             <code class="text-muted"><?php echo htmlspecialchars("[/[<domain>]/[domain/]][<ipaddr>[#<port>][@<source-ip>|<interface>[#<port>]]"); ?></code>
           </small>
         </p>
-        <select class="custom-select custom-select-sm js-field-preset" data-field-preset-target="#add-dhcp-upstream-server-field">
+        <select class="custom-select custom-select-sm js-field-preset" id="cbxdhcpupstreamserver" data-field-preset-target="#add-dhcp-upstream-server-field">
           <option value=""><?php echo _("Choose a hosted server") ?></option>
           <option disabled="disabled"></option>
           <?php echo optionsForSelect(dnsServers()) ?>