diff --git a/scripts/upgrade b/scripts/upgrade
index e9c7b57..ef09b20 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,22 +22,22 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
-googleYoutube="$(ynh_app_setting_get --app="$app" --key=googleYoutube)"
-if [[ -n "${googleYoutube:-}" ]]; then
-	# migrate camelCase to snake_case
-	apikey_google_youtube="$googleYoutube"
-	ynh_app_setting_set --app="$app" --key="apikey_google_youtube" --value="$apikey_google_youtube"
-	ynh_app_setting_delete --app="$app" --key="googleYoutube"
-fi
-
-pixabay="$(ynh_app_setting_get --app="$app" --key=pixabay)"
-if [[ -n "${pixabay:-}" ]]; then
+# migrate camelCase to snake_case
+if [[ -z "$apikey_pixabay" ]]; then
 	# migrate camelCase to snake_case
+	pixabay="$(ynh_app_setting_get --app="$app" --key=pixabay)"
 	apikey_pixabay="$pixabay"
 	ynh_app_setting_set --app="$app" --key="apikey_pixabay" --value="$apikey_pixabay"
 	ynh_app_setting_delete --app="$app" --key="pixabay"
 fi
 
+if [[ -z "$apikey_google_youtube" ]]; then
+	googleYoutube="$(ynh_app_setting_get --app="$app" --key=googleYoutube)"
+	apikey_google_youtube="$googleYoutube"
+	ynh_app_setting_set --app="$app" --key="apikey_google_youtube" --value="$apikey_google_youtube"
+	ynh_app_setting_delete --app="$app" --key="googleYoutube"
+fi
+
 #=================================================
 # INSTALL NODEJS
 #=================================================
diff --git a/tests.toml b/tests.toml
index 1439b11..3be94b0 100644
--- a/tests.toml
+++ b/tests.toml
@@ -8,3 +8,5 @@ test_format = 1.0
     args.apikey_google_youtube = "1337c0c4"
 
     test_upgrade_from.3bb42cd71bcca77b7f642859bf5048317586a500.name = "First release"
+    test_upgrade_from.3bb42cd71bcca77b7f642859bf5048317586a500.args.pixabay = "cafe1007"
+    test_upgrade_from.3bb42cd71bcca77b7f642859bf5048317586a500.args.googleYoutube = "1337c0c4"