diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php
index 1705d4a0b2..f07df1efac 100644
--- a/src/usr/local/www/system.php
+++ b/src/usr/local/www/system.php
@@ -524,7 +524,7 @@ if ($dnsserver_count == 0) {
 
 foreach ($pconfig['dnsserver'] as $dnsserver) {
 
-	$is_last_dnsserver = ($dnsserver_num == $dnsserver_count - 1);
+	$is_last_dnsserver = (($dnsserver_num == $dnsserver_count - 1) || $dnsserver_count == 0);
 	$group = new Form_Group($dnsserver_num == 0 ? 'DNS Servers':'');
 	$group->addClass('repeatable');