diff --git a/map-agent/files/lib/multiap/map_genconfig b/map-agent/files/lib/multiap/map_genconfig
index e2e2abfa9..c4cc2c984 100644
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -258,7 +258,6 @@ map_genconf () {
 				config_foreach mapcontroller_remove_mld_id ap
 			}
 		fi
-		uci -q commit mapcontroller
-		ubus send bbfdm.wifidmd.reload
+		ubus -t 5 call uci commit '{"config":"mapcontroller"}'
 	fi
 }
diff --git a/wifidmd/files/etc/init.d/wifidmd b/wifidmd/files/etc/init.d/wifidmd
index 35900a455..1b7332c5f 100644
--- a/wifidmd/files/etc/init.d/wifidmd
+++ b/wifidmd/files/etc/init.d/wifidmd
@@ -20,11 +20,16 @@ start_service()
 
 reload_service()
 {
-	stop
-	start
+	ret=$(ubus call service list '{"name":"wifidmd"}' | jsonfilter -qe '@.wifidmd.instances.wifidmd.running')
+	if [ "$ret" != "true" ]; then
+		stop
+		start
+	else
+		procd_send_signal wifidmd '*' SIGUSR1
+	fi
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger wifidmd
+	procd_add_reload_trigger wifidmd mapcontroller
 }