diff --git a/templates/dhcp/general.php b/templates/dhcp/general.php
index 6eaea7cf..b788c87a 100644
--- a/templates/dhcp/general.php
+++ b/templates/dhcp/general.php
@@ -3,7 +3,7 @@
   <div class="row">
     <div class="mb-3 col-md-6">
       <label for="code">Interface</label>
-        <?php SelectorOptions('interface', $interfaces, $ap_iface, 'cbxdhcpiface', 'loadInterfaceDHCPSelect', $DHCPDisabled); ?>
+        <?php SelectorOptions('interface', $interfaces, $ap_iface, 'cbxdhcpiface', 'loadInterfaceDHCPSelect'); ?>
     </div>
   </div>
 
diff --git a/templates/dhcp/logging.php b/templates/dhcp/logging.php
index a82954a5..975b64a3 100644
--- a/templates/dhcp/logging.php
+++ b/templates/dhcp/logging.php
@@ -4,11 +4,11 @@
   <p><?php echo _("Enable these options to log <code>dhcpcd</code> and <code>dnsmasq</code> activity.") ?></p>
 
   <div class="form-check form-switch">
-    <input class="form-check-input" id="log-dhcp" type="checkbox" name="log-dhcp" value="1" <?php echo $conf['log-dhcp'] ? ' checked="checked"' : "" ?> aria-describedby="log-dhcp-requests">
+    <input class="form-check-input" id="log-dhcp" type="checkbox" name="log-dhcp" value="1" <?php echo !empty($conf['log-dhcp']) ? ' checked="checked"' : "" ?> aria-describedby="log-dhcp-requests">
     <label class="form-check-label" for="log-dhcp"><?php echo _("Log DHCP requests") ?></label>
   </div>
   <div class="form-check form-switch">
-    <input class="form-check-input" id="log-queries" type="checkbox" name="log-queries" value="1" <?php echo $conf['log-queries'] ? ' checked="checked"' : "" ?> aria-describedby="log-dhcp-queries">
+    <input class="form-check-input" id="log-queries" type="checkbox" name="log-queries" value="1" <?php echo !empty($conf['log-queries']) ? ' checked="checked"' : "" ?> aria-describedby="log-dhcp-queries">
     <label class="form-check-label align-middle" for="log-queries"><?php echo _("Log DNS queries") ?></label>
     <input type="button" class="btn btn-outline btn-warning btn-sm align-top ms-4" id="js-cleardnsmasq-log" value="<?php echo _("Clear log"); ?>" />
   </div>
@@ -16,7 +16,7 @@
   <div class="row">
     <div class="mb-3 col-md-8 mt-2">
       <?php
-      if ($conf['log-dhcp'] == 1 || $conf['log-queries'] == 1) {
+      if (($conf['log-dhcp'] ?? 0) == 1 || ($conf['log-queries'] ?? 0) == 1) {
           echo '<textarea class="logoutput text-secondary" id="dnsmasq-log">'.htmlspecialchars($logdata, ENT_QUOTES).'</textarea>';
       } else {
           echo '<textarea class="logoutput my-3"></textarea>';
diff --git a/templates/dhcp/static_leases.php b/templates/dhcp/static_leases.php
index caddc6bb..e92772ae 100644
--- a/templates/dhcp/static_leases.php
+++ b/templates/dhcp/static_leases.php
@@ -47,7 +47,7 @@
         <div class="input-group">
           <input type="hidden" name="dhcp-ignore" value="0">
             <div class="form-check form-switch">
-              <input class="form-check-input" id="dhcp-ignore" type="checkbox" name="dhcp-ignore" value="1" <?php echo $conf['dhcp-ignore'] ? ' checked="checked"' : "" ?> aria-describedby="dhcp-ignore-description">
+              <input class="form-check-input" id="dhcp-ignore" type="checkbox" name="dhcp-ignore" value="1" <?php echo !empty($conf['dhcp-ignore']) ? ' checked="checked"' : "" ?> aria-describedby="dhcp-ignore-description">
               <label class="form-check-label" for="dhcp-ignore"><?php echo _("Limit network access to static clients") ?></label>
             </div>
             <p id="dhcp-ignore-description">