diff --git a/conf/ynh-hotspot b/conf/ynh-hotspot
index de0f730..b3b2a9a 100644
--- a/conf/ynh-hotspot
+++ b/conf/ynh-hotspot
@@ -256,11 +256,25 @@ ynh_setting_get() {
 }
 
 ynh_setting_set() {
-  app=${1}
-  setting=${2}
-  value=${3}
 
-  yunohost app setting "${app}" "${setting}" -v "${value}"
+    # This is a partial copypasta of the official ynh_app_setting internal helper
+    # In particular, we do this instead of relying on 'yunohost app setting' for
+    # performance reasons (it takes a few second to run every yunohost commands)
+    # and to remove the need for the infamous '--need-lock' option/issue.
+
+    app="$1" key="$2" value="${3:-}" python2.7 - <<EOF
+import os, yaml, sys
+app = os.environ['app']
+key, value = os.environ['key'], os.environ.get('value', None)
+setting_file = "/etc/yunohost/apps/%s/settings.yml" % app
+assert os.path.exists(setting_file), "Setting file %s does not exists ?" % setting_file
+with open(setting_file) as f:
+    settings = yaml.load(f)
+settings[key] = value
+with open(setting_file, "w") as f:
+    yaml.safe_dump(settings, f, default_flow_style=False)
+EOF
+
 }
 
 devfromid() {
diff --git a/scripts/install b/scripts/install
index 30b4abf..b4e80cd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -309,7 +309,7 @@ fi
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock
+yunohost service add $service_name --description "Creates a Wi-Fi access point"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/restore b/scripts/restore
index e95a43a..1a3be3a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -136,7 +136,7 @@ systemctl enable $service_name.service
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock
+yunohost service add $service_name --description "Creates a Wi-Fi access point"
 
 #=================================================
 # START SYSTEMD SERVICE
diff --git a/scripts/upgrade b/scripts/upgrade
index ba9a942..166bdc2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -199,7 +199,7 @@ find ${final_path}/ -type d -exec chmod +x {} \;
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $service_name --description "Creates a Wi-Fi access point" --need_lock
+yunohost service add $service_name --description "Creates a Wi-Fi access point"
 
 #=================================================
 # START SYSTEMD SERVICE