diff --git a/scripts/remove b/scripts/remove
index 88ad86b..e2cbdf3 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -29,13 +29,22 @@ data_path=$(ynh_app_setting_get --app=$app --key=data_path)
 # REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
 
+ynh_script_progression --message="Removing $app services integration..." --weight=1
+
 # 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
+if ynh_exec_warn_less yunohost service status $app-backend >/dev/null ; then
 	yunohost service remove $app-backend
+fi
+
+if ynh_exec_warn_less yunohost service status $app-frontend >/dev/null ; then
 	yunohost service remove $app-frontend
+fi
+
+if ynh_exec_warn_less yunohost service status $app-image-similarity >/dev/null ; then
 	yunohost service remove $app-image-similarity
+fi
+
+if ynh_exec_warn_less yunohost service status $app-worker >/dev/null ; then
 	yunohost service remove $app-worker
 fi