diff --git a/scripts/remove b/scripts/remove
index 6fda864..06cecf6 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -23,13 +23,6 @@ final_path=$(ynh_app_setting_get $app final_path)
 
 #=================================================
 # STANDARD REMOVE
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-
-# Remove the dedicated systemd config
-ynh_remove_systemd_config
-
 #=================================================
 # REMOVE SERVICE FROM ADMIN PANEL
 #=================================================
@@ -41,6 +34,14 @@ then
 	yunohost service remove $app
 fi
 
+#=================================================
+# STOP AND REMOVE SERVICE
+#=================================================
+
+# Remove the dedicated systemd config
+ynh_remove_systemd_config
+
+
 #=================================================
 # REMOVE THE MYSQL DATABASE
 #=================================================