diff --git a/scripts/_common.sh b/scripts/_common.sh
index 0f01b88..6be8a1d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -212,3 +212,7 @@ function vpnclient_deploy_files_and_services()
   # Reload systemd configuration
   systemctl daemon-reload
 }
+
+function service_is_managed_by_yunohost() {
+  yunohost service status $1 >/dev/null 2>&1
+}
diff --git a/scripts/upgrade b/scripts/upgrade
index 91ff50b..eef179d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -93,12 +93,18 @@ systemctl reload nginx
 
 # main service
 
-yunohost service remove $service_name
+if service_is_managed_by_yunohost $service_name
+then
+  yunohost service remove $service_name
+fi
 yunohost service add $service_name --description "tunnels the internet traffic through a VPN" --need_lock
 
 # checker service
 
-yunohost service remove $service_checker_name
+if service_is_managed_by_yunohost $service_checker_name
+then
+  yunohost service remove $service_checker_name
+fi
 yunohost service add $service_checker_name --description "makes sure that the VPN service is running" --need_lock
 
 # Reload systemd configuration