diff --git a/scripts/install b/scripts/install
index ce873af..85e1ca4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -257,10 +257,10 @@ ynh_multimedia_addaccess $app
 # Fix app ownerships & permissions
 chown -R $app:www-data "$install_dir"
 chown -R $app: "$data_dir"
-find $install_dir/ -type f -print0 | xargs -0 chmod 0644
-find $install_dir/ -type d -print0 | xargs -0 chmod 0755
-find $data_dir/data/ -type f -print0 | xargs -0 chmod 0640
-find $data_dir/data/ -type d -print0 | xargs -0 chmod 0750
+find $install_dir/ -type f -print0 | xargs -r0 chmod 0644
+find $install_dir/ -type d -print0 | xargs -r0 chmod 0755
+find $data_dir/data/ -type f -print0 | xargs -r0 chmod 0640
+find $data_dir/data/ -type d -print0 | xargs -r0 chmod 0750
 chmod 640 "$install_dir/config/config.php"
 chmod 755 /home/yunohost.app
 chmod 750 $install_dir
diff --git a/scripts/restore b/scripts/restore
index 3dde00f..90d8fba 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -81,10 +81,10 @@ ynh_restore_file --origin_path="$data_dir" --not_mandatory
 # Fix app ownerships & permissions
 chown -R $app:www-data "$install_dir"
 chown -R $app: "$data_dir"
-find $install_dir/ -type f -print0 | xargs -0 chmod 0644
-find $install_dir/ -type d -print0 | xargs -0 chmod 0755
-find $data_dir/data/ -type f -print0 | xargs -0 chmod 0640
-find $data_dir/data/ -type d -print0 | xargs -0 chmod 0750
+find $install_dir/ -type f -print0 | xargs -r0 chmod 0644
+find $install_dir/ -type d -print0 | xargs -r0 chmod 0755
+find $data_dir/data/ -type f -print0 | xargs -r0 chmod 0640
+find $data_dir/data/ -type d -print0 | xargs -r0 chmod 0750
 chmod 640 "$install_dir/config/config.php"
 chmod 755 /home/yunohost.app
 chmod 750 $install_dir
diff --git a/scripts/upgrade b/scripts/upgrade
index 5c085d4..cd5db61 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -341,10 +341,10 @@ exec_occ background:cron
 # Fix app ownerships & permissions
 chown -R $app:www-data "$install_dir"
 chown -R $app: "$data_dir"
-find $install_dir/ -type f -print0 | xargs -0 chmod 0644
-find $install_dir/ -type d -print0 | xargs -0 chmod 0755
-find $data_dir/data/ -type f -print0 | xargs -0 chmod 0640
-find $data_dir/data/ -type d -print0 | xargs -0 chmod 0750
+find $install_dir/ -type f -print0 | xargs -r0 chmod 0644
+find $install_dir/ -type d -print0 | xargs -r0 chmod 0755
+find $data_dir/data/ -type f -print0 | xargs -r0 chmod 0640
+find $data_dir/data/ -type d -print0 | xargs -r0 chmod 0750
 chmod 640 "$install_dir/config/config.php"
 chmod 755 /home/yunohost.app
 chmod 750 $install_dir