diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index f01761f1b..f6b275150 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -1074,8 +1074,10 @@ function interfaces_status()
 		mArray.openmptcprouter.dhcpd[itf].range_end = range_end
 		mArray.openmptcprouter.dhcpd[itf].netmask = mask
 		mArray.openmptcprouter.dhcpd[itf].leasetime = leasetime
-		mArray.openmptcprouter.dhcpd[itf].router = mArray.openmptcprouter["local_addr"]
-		mArray.openmptcprouter.dhcpd[itf].dns = mArray.openmptcprouter["local_addr"]
+		local net = ntm:get_network(itf)
+		local ipaddr = net:ipaddr() or ""
+		mArray.openmptcprouter.dhcpd[itf].router = ipaddr
+		mArray.openmptcprouter.dhcpd[itf].dns = ipaddr
 	end
 	for itf, option, value in dnsmasq:gmatch("option=(%w+),([%w:-]+),(%d+\.%d+\.%d+\.%d+)") do
 		if mArray.openmptcprouter.dhcpd[itf] then
diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
index ee5922803..832fdc808 100755
--- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network
+++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
@@ -167,6 +167,7 @@ set network.lan.metric=2048
 set network.lan.ipv6=0
 set network.lan.delegate=0
 set network.lan.addlatency=0
+set dhcp.lan.dhcpv4='server'
 EOF
 
 uci -q batch <<-EOF
@@ -405,5 +406,6 @@ fi
 
 uci -q commit macvlan
 uci -q commit network
+uci -q commit dhcp
 rm -f /tmp/luci-indexcache
 exit 0