diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index 263384b..dc29760 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -97,7 +97,7 @@ presence:
   # Uncomment to disable presence tracking on this homeserver. This option
   # replaces the previous top-level 'use_presence' option.
   #
-  #enabled: false
+  enabled: __PRESENCE__
 
 # Whether to require authentication to retrieve profile data (avatars,
 # display names) of other users through the client API. Defaults to
diff --git a/config_panel.toml b/config_panel.toml
index 4a28765..a07c1cf 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -110,6 +110,13 @@ services = ["__APP__"]
     [main.experience]
     name = "User Experience"
 
+        [main.experience.presence_tracking]
+        ask = "Enable Presence tracking feature"
+        type = "boolean"
+        yes = "true"
+        no = "false"
+        help = "Presence tracking allows users to see the state (e.g online/offline) of other local and remote users. Defaults to 'true'."
+
         [main.experience.web_client_location]
         ask = "Element instance your HomeServer should redirect to"
         type = "url"
diff --git a/scripts/install b/scripts/install
index 3eb3cfa..1d48282 100644
--- a/scripts/install
+++ b/scripts/install
@@ -25,6 +25,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 report_stats="false"
 e2e_enabled_by_default="off"
+presence_tracking=true
 allow_public_rooms_without_auth="false"
 allow_public_rooms_over_federation="false"
 max_upload_size="100M"
@@ -72,6 +73,7 @@ ynh_app_setting_set --app=$app --key=web_client_location --value=$web_client_loc
 ynh_app_setting_set --app=$app --key=client_base_url --value=$client_base_url
 ynh_app_setting_set --app=$app --key=invite_client_location --value=$invite_client_location
 ynh_app_setting_set --app=$app --key=allow_public_rooms_without_auth --value=$allow_public_rooms_without_auth
+ynh_app_setting_set --app=$app --key=presence_tracking --value=$presence_tracking
 ynh_app_setting_set --app=$app --key=allow_public_rooms_over_federation --value=$allow_public_rooms_over_federation
 ynh_app_setting_set --app=$app --key=max_upload_size --value=$max_upload_size
 ynh_app_setting_set --app=$app --key=disable_msisdn_registration --value=$disable_msisdn_registration
diff --git a/scripts/upgrade b/scripts/upgrade
index c50309c..142bf7b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -205,6 +205,12 @@ then
     ynh_app_setting_set --app=$app --key=enable_dtls_for_audio_video_turn_call --value=$enable_dtls_for_audio_video_turn_call
 fi
 
+if [ -z "${presence_tracking:-}" ]
+then
+    presence_tracking=true
+    ynh_app_setting_set --app=$app --key=presence_tracking --value=$presence_tracking
+fi
+
 #=================================================
 # MIGRATION 7 : STANDARDIZE SYSTEMD UNIT
 #=================================================