diff --git a/scripts/upgrade b/scripts/upgrade
index e8dc4af..693a710 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -103,7 +103,7 @@ backup_before_upgrade=$(ynh_app_setting_get --app=$app --key=backup_before_upgra
 if [ -z $backup_before_upgrade ] ; then
     backup_before_upgrade="true"
     disable_backup_before_upgrade=$(ynh_app_setting_get --app=$app --key=disable_backup_before_upgrade)
-    if [ $disable_backup_before_upgrade ] ; then
+    if [ "0$disable_backup_before_upgrade" -ne 1 ]; then
         backup_before_upgrade="false"
     fi
     ynh_app_setting_set --app=$app --key=backup_before_upgrade --value=$backup_before_upgrade
@@ -117,7 +117,7 @@ fi
 ynh_systemd_action --service_name=matrix-$app.service --action=stop
 
 # Backup the current version of the app
-if [ $backup_before_upgrade ] ; then
+if $backup_before_upgrade ; then
     ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=30
     ynh_backup_before_upgrade
     ynh_clean_setup () {