diff --git a/includes/dhcp.php b/includes/dhcp.php
index 0ebf641b..bc323200 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -45,12 +45,15 @@ function DisplayDHCPConfig()
         }
     }
     getWifiInterface();
+    $ap_iface = $_SESSION['ap_interface'];
     $serviceStatus = $dnsmasq_state ? "up" : "down";
     exec('cat '. RASPI_DNSMASQ_PREFIX.'raspap.conf', $return);
     $conf = ParseConfig($return);
+    exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return);
+    $conf = array_merge(ParseConfig($return));
+    $hosts = (array)$conf['dhcp-host'];
     exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
     exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
-    $ap_iface = $_SESSION['ap_interface'];
 
     echo renderTemplate(
         "dhcp", compact(
@@ -59,7 +62,7 @@ function DisplayDHCPConfig()
             "dnsmasq_state",
             "ap_iface",
             "conf",
-            "dhcpHost",
+            "hosts",
             "interfaces",
             "leases"
         )
diff --git a/templates/dhcp/static_leases.php b/templates/dhcp/static_leases.php
index 3b804270..638ff064 100644
--- a/templates/dhcp/static_leases.php
+++ b/templates/dhcp/static_leases.php
@@ -3,7 +3,7 @@
   <h4 class="mt-3 mb-3"><?php echo _("Static leases") ?></h4>
 
   <div class="dhcp-static-leases js-dhcp-static-lease-container">
-    <?php foreach ($dhcpHost as $host) : ?>
+    <?php foreach ($hosts as $host) : ?>
       <?php list($mac, $ip) = array_map("trim", explode(",", $host)); ?>
       <div class="row dhcp-static-lease-row js-dhcp-static-lease-row">
         <div class="col-md-5 col-xs-5">