diff --git a/scripts/_common.sh b/scripts/_common.sh
index 944a65e..254a379 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,6 +8,13 @@
 # PERSONAL HELPERS
 #=================================================
 
+get_synapse_db_name() {
+	# Parameters: synapse instance identifier
+	# Returns: database name
+	ynh_app_setting_get --app="$1" --key=db_name
+}
+
+
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index e1f2321..2022ef9 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers
 # LOAD SETTINGS
 #=================================================
 
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 bot_synapse_db_user="@$botname:$server_name"
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index adcf9e2..94755cf 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -11,7 +11,7 @@ source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 mautrix_version=$(ynh_app_upstream_version)
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 bot_synapse_db_user="@$botname:$server_name"
 
 #=================================================