diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index a748e4533..e2b4447cf 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -996,7 +996,6 @@ service:
                     choices:
                         - file
                         - systemd
-                    default: file
                 --test_status:
                     help: Specify a custom bash command to check the status of the service. Note that it only makes sense to specify this if the corresponding systemd service does not return the proper information already.
                 --test_conf:
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index a048c5a41..40a0fcc0b 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -70,7 +70,8 @@ def service_add(name, description=None, log=None, log_type=None, test_status=Non
         if log_type is not None:
             logger.warning("/!\\ Packagers! --log_type is deprecated. You do not need to specify --log_type systemd anymore ... Yunohost now automatically fetch the journalctl of the systemd service by default.")
             # Usually when adding such a service, the service name will be provided so we remove it as it's not a log file path
-            log.remove(name)
+            if name in log:
+                log.remove(name)
 
         service['log'] = log