diff --git a/map-controller/files/etc/init.d/mapcontroller b/map-controller/files/etc/init.d/mapcontroller
index 1b48b59e6..5500146fb 100755
--- a/map-controller/files/etc/init.d/mapcontroller
+++ b/map-controller/files/etc/init.d/mapcontroller
@@ -6,14 +6,14 @@ STOP=20
 USE_PROCD=1
 
 start_service() {
-	config_load "mapcontroller"
-
 	local enabled
+
+	config_load "mapcontroller"
 	config_get_bool enabled controller enabled 1
-	[ "$enabled" -eq 0 ] && return 1
+	[ "$enabled" -eq 0 ] && return
 
 	procd_open_instance
-        procd_set_param command "/usr/sbin/mapcontroller" "-d"
+	procd_set_param command "/usr/sbin/mapcontroller" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
@@ -22,10 +22,18 @@ start_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger "ieee1905"
+	procd_add_reload_trigger "mapcontroller"
 }
 
 reload_service() {
-	stop
-	start
+	local enabled
+
+	config_load "mapcontroller"
+	config_get_bool enabled controller enabled 1
+	if [ "$enabled" -eq 0 ]; then
+		stop
+		return
+	fi
+
+	procd_send_signal "mapcontroller"
 }