diff --git a/scripts/upgrade b/scripts/upgrade
index ce0f55a5..c2229d67 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -53,13 +53,15 @@ if [ -z "${fpm_usage:-}" ]; then
     ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 fi
 
-# Switch $database to "mysql" or "postgresql"
-if [[ $database == "1" ]] 2>/dev/null; then
-	database="mysql"
-	ynh_app_setting_set --app=$app --key=database --value=$database
-elif [[ $database == "2" ]] 2>/dev/null; then
-	database="postgresql"
-	ynh_app_setting_set --app=$app --key=database --value=$database
+#=================================================
+# MIGRATING DATABASE
+#=================================================
+
+# Check if using MariaDB
+# This migration should be done before the upgrade
+if mysqlshow | grep -q "^| $db_name "; then
+    remove_psql_in_case_of_error=1
+    mariadb-to-pg
 fi
 
 #=================================================