diff --git a/src/www/status_dhcp_leases.php b/src/www/status_dhcp_leases.php
index 939d8efdd..6902f14b2 100644
--- a/src/www/status_dhcp_leases.php
+++ b/src/www/status_dhcp_leases.php
@@ -425,22 +425,19 @@ include("head.inc");?>
                   <td><?=$data['online'];?></td>
                   <td><?=$data['act'];?></td>
                   <td class="text-nowrap">
-<?php
-                    if ($data['type'] == "dynamic"):?>
+<?php if (!empty($data['if'])): ?>
+<?php if ($data['type'] == 'dynamic'): ?>
                       <a class="btn btn-default btn-xs" href="services_dhcp_edit.php?if=<?=$data['if'];?>&amp;mac=<?=$data['mac'];?>&amp;hostname=<?=$data['hostname'];?>">
                         <i class="fa fa-plus fa-fw" data-toggle="tooltip" title="<?=gettext("add a static mapping for this MAC address");?>"></i>
                       </a>
-<?php
-                    endif;?>
-<?php
-                    if (($data['type'] == "dynamic") && ($data['online'] != "online")):?>
+<?php if ($data['online'] != 'online'):?>
 
                       <a class="act_delete btn btn-default btn-xs" href="#" data-deleteip="<?=$data['ip'];?>">
                         <i class="fa fa-trash fa-fw" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip"></i>
                       </a>
-<?php
-                    endif;?>
-
+<?php endif ?>
+<?php endif ?>
+<?php endif ?>
                   </td>
               </tr>
 <?php
diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php
index 18fc4c207..d43bc09a9 100644
--- a/src/www/status_dhcpv6_leases.php
+++ b/src/www/status_dhcpv6_leases.php
@@ -480,20 +480,18 @@ endif;?>
                   <td><?=$data['online'];?></td>
                   <td><?=$data['act'];?></td>
                   <td class="text-nowrap">
-<?php
-                      if ($data['type'] == "dynamic"):?>
+<?php if (!empty($data['if'])): ?>
+<?php if ($data['type'] == 'dynamic'): ?>
                         <a class="btn btn-default btn-xs" href="services_dhcpv6_edit.php?if=<?=$data['if'];?>&amp;duid=<?=$data['duid'];?>&amp;hostname=<?=$data['hostname'];?>">
                           <i class="fa fa-plus fa-fw" alt="add"></i>
                         </a>
-<?php
-                      endif;?>
-<?php
-                    if (($data['type'] == "dynamic") && ($data['online'] != "online")):?>
+<?php if ($data['online'] != 'online'): ?>
                     <a class="act_delete btn btn-default btn-xs" href="#" data-deleteip="<?=$data['ip'];?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip">
                       <i class="fa fa-trash fa-fw"></i>
                     </a>
-<?php
-                    endif;?>
+<?php endif ?>
+<?php endif ?>
+<?php endif ?>
                   </td>
                 </tr>
 <?php