diff --git a/roles/ynh_backup/tasks/main.yml b/roles/ynh_backup/tasks/main.yml
index 86cbde31656c3443f378a4ef68b440bae90b53f8..4504da6682682ecea97844050ef37b02a6c334a3 100644
--- a/roles/ynh_backup/tasks/main.yml
+++ b/roles/ynh_backup/tasks/main.yml
@@ -20,13 +20,10 @@
 
 - name: Enable Yunohost apps backup
   ansible.builtin.include_tasks: backup.yml
-  when: ynh_backup.scheduled
-  tags:
-    - backup
+  when: ynh_backup.scheduled and ynh_backup.system or ynh_backup.apps
+  tags: backup
 
 - name: Use Borg Backup with YunoHost
   ansible.builtin.include_tasks: borgbackup.yml
   when: ynh_borg_backup_scheduled
-  tags:
-    - backup
-    - borg
+  tags: borg