diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 9218788b5e..92eb14bb11 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -77,7 +77,13 @@ generate_network() {
 		set network.$1.type='$type'
 		set network.$1.ifname='$ifname'
 		set network.$1.proto='none'
-		set network.$1.macaddr='$macaddr'
+	EOF
+
+	[ -n "$macaddr" ] && uci -q batch <<-EOF
+		delete network.$1_dev
+		set network.$1_dev='device'
+		set network.$1_dev.name='$ifname'
+		set network.$1_dev.macaddr='$macaddr'
 	EOF
 
 	case "$protocol" in