diff --git a/scripts/remove b/scripts/remove
index 009fe57..39f10dc 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -24,6 +24,17 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
 # STANDARD REMOVE
+#=================================================
+# REMOVE SERVICE INTEGRATION IN YUNOHOST
+#=================================================
+
+# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
+if ynh_exec_warn_less yunohost service status $app >/dev/null
+then
+	ynh_script_progression --message="Removing $app service integration..." --weight=1
+	yunohost service remove $app
+fi
+
 #=================================================
 # STOP AND REMOVE SERVICE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 3476bc1..957b221 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,7 @@ ynh_script_progression --message="Loading installation settings..."
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_normalize_url_path --path_url $(ynh_app_setting_get --app $app --key path))
+path_url=$(ynh_app_setting_get --app $app --key path)
 final_path=$(ynh_app_setting_get --app $app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 secret=$(ynh_app_setting_get --app $app --key=secret)