diff --git a/scripts/upgrade b/scripts/upgrade
index 09810f0..8c7ad84 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,6 +34,7 @@ turnserver_alt_tls_port=$(ynh_app_setting_get --app=$app --key=turnserver_alt_tl
 cli_port=$(ynh_app_setting_get --app=$app --key=cli_port)
 report_stats=$(ynh_app_setting_get --app=$app --key=report_stats)
 e2e_enabled_by_default=$(ynh_app_setting_get --app=$app --key=e2e_enabled_by_default)
+e2e_enabled_by_default_in_element=$(ynh_app_setting_get --app=$app --key=e2e_enabled_by_default_in_element)
 synapse_db_pwd=$(ynh_app_setting_get --app=$app --key=synapse_db_pwd)
 turnserver_pwd=$(ynh_app_setting_get --app=$app --key=turnserver_pwd)
 registration_shared_secret=$(ynh_app_setting_get --app=$app --key=registration_shared_secret)
@@ -179,6 +180,27 @@ if [ "$e2e_enabled_by_default" = "false" ]; then
    ynh_app_setting_set --app=$app --key=e2e_enabled_by_default --value=$e2e_enabled_by_default
 fi
 
+# Define $e2e_enabled_by_default_in_element if not already defined
+if [ -z $e2e_enabled_by_default_in_element ] ; then
+   e2e_enabled_by_default_in_element="true"
+   ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value=$e2e_enabled_by_default_in_element
+fi
+
+if [ "$e2e_enabled_by_default" = "invite" ] ; then
+   e2e_enabled_by_default_in_element="true"
+   ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value=$e2e_enabled_by_default_in_element
+fi
+
+if [ "$e2e_enabled_by_default" = "all" ] ; then
+   e2e_enabled_by_default_in_element="true"
+   ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value=$e2e_enabled_by_default_in_element
+fi
+
+if [ "$e2e_enabled_by_default" = "off" ] ; then
+   e2e_enabled_by_default_in_element="false"
+   ynh_app_setting_set --app=$app --key=e2e_enabled_by_default_in_element --value=$e2e_enabled_by_default_in_element
+fi
+
 if [ -z $report_stats ]; then
     report_stats="false"
     ynh_app_setting_set --app=$app --key=report_stats --value=$report_stats