diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 9a9f6d366a..bea8a5f568 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -79,6 +79,10 @@ function services_dhcpd_configure() {
 			(isset($config['interfaces'][$dhcpif]['enable']) &&
 			$config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
 			$dhcpdenable = true;
+		if (isset($dhcpifconf['enable']) &&
+			(($dhcpif == "wan") || (isset($config['interfaces'][$dhcpif]['enable']) &&
+			$config['interfaces'][$dhcpif]['if'] && (!$config['interfaces'][$dhcpif]['bridge']))))
+			$dhcpdenable = true;			
 	}
 
 	if (!$dhcpdenable)