diff --git a/frontend_tests/node_tests/settings_org.js b/frontend_tests/node_tests/settings_org.js
index fb90f0f9de..f574bfa160 100644
--- a/frontend_tests/node_tests/settings_org.js
+++ b/frontend_tests/node_tests/settings_org.js
@@ -463,14 +463,16 @@ function test_discard_changes_button(discard_changes) {
     const $message_content_edit_limit_minutes = $(
         "#id_realm_message_content_edit_limit_minutes",
     ).val(130);
-    const $msg_delete_limit_setting = $("#id_realm_msg_delete_limit_setting").val("custom_period");
+    const $msg_delete_limit_setting = $("#id_realm_message_content_delete_limit_seconds").val(
+        "custom_period",
+    );
     const $message_content_delete_limit_minutes = $(
         "#id_realm_message_content_delete_limit_minutes",
     ).val(130);
 
     $allow_edit_history.attr("id", "id_realm_allow_edit_history");
     $msg_edit_limit_setting.attr("id", "id_realm_message_content_edit_limit_seconds");
-    $msg_delete_limit_setting.attr("id", "id_realm_msg_delete_limit_setting");
+    $msg_delete_limit_setting.attr("id", "id_realm_message_content_delete_limit_seconds");
     $edit_topic_policy.attr("id", "id_realm_edit_topic_policy");
     $message_content_edit_limit_minutes.attr("id", "id_realm_message_content_edit_limit_minutes");
     $message_content_delete_limit_minutes.attr(
diff --git a/static/js/settings_org.js b/static/js/settings_org.js
index 98a5c96c4b..4eb76175f8 100644
--- a/static/js/settings_org.js
+++ b/static/js/settings_org.js
@@ -190,7 +190,7 @@ function get_property_value(property_name, for_realm_default_settings) {
         return "retain_for_period";
     }
 
-    if (property_name === "realm_msg_delete_limit_setting") {
+    if (property_name === "realm_message_content_delete_limit_seconds") {
         if (page_params.realm_message_content_delete_limit_seconds === null) {
             return "any_time";
         }
@@ -342,10 +342,10 @@ function set_delete_own_message_policy_dropdown(setting_value) {
     $("#id_realm_delete_own_message_policy").val(setting_value);
     settings_ui.disable_sub_setting_onchange(
         message_delete_limit_setting_enabled(setting_value),
-        "id_realm_msg_delete_limit_setting",
+        "id_realm_message_content_delete_limit_seconds",
         true,
     );
-    const limit_value = get_property_value("realm_msg_delete_limit_setting");
+    const limit_value = get_property_value("realm_message_content_delete_limit_seconds");
     if (limit_value === "custom_period") {
         settings_ui.disable_sub_setting_onchange(
             message_delete_limit_setting_enabled(setting_value),
@@ -356,8 +356,8 @@ function set_delete_own_message_policy_dropdown(setting_value) {
 }
 
 function set_msg_delete_limit_dropdown() {
-    const value = get_property_value("realm_msg_delete_limit_setting");
-    $("#id_realm_msg_delete_limit_setting").val(value);
+    const value = get_property_value("realm_message_content_delete_limit_seconds");
+    $("#id_realm_message_content_delete_limit_seconds").val(value);
     change_element_block_display_property(
         "id_realm_message_content_delete_limit_minutes",
         value === "custom_period",
@@ -484,7 +484,7 @@ function update_dependent_subsettings(property_name) {
         case "realm_message_retention_days":
             set_message_retention_setting_dropdown();
             break;
-        case "realm_msg_delete_limit_setting":
+        case "realm_message_content_delete_limit_seconds":
         case "realm_message_content_delete_limit_minutes":
             set_msg_delete_limit_dropdown();
             break;
@@ -993,7 +993,9 @@ export function register_save_discard_widget_handlers(
                             ).seconds;
                     }
                 }
-                const delete_limit_setting_value = $("#id_realm_msg_delete_limit_setting").val();
+                const delete_limit_setting_value = $(
+                    "#id_realm_message_content_delete_limit_seconds",
+                ).val();
                 switch (delete_limit_setting_value) {
                     case "any_time": {
                         data.message_content_delete_limit_seconds = JSON.stringify("unlimited");
@@ -1219,7 +1221,7 @@ export function build_page() {
         }
     });
 
-    $("#id_realm_msg_delete_limit_setting").on("change", (e) => {
+    $("#id_realm_message_content_delete_limit_seconds").on("change", (e) => {
         const msg_delete_limit_dropdown_value = e.target.value;
         const show_custom_limit_input = msg_delete_limit_dropdown_value === "custom_period";
         change_element_block_display_property(
diff --git a/static/styles/settings.css b/static/styles/settings.css
index 6c03891f9f..bed9970777 100644
--- a/static/styles/settings.css
+++ b/static/styles/settings.css
@@ -1496,7 +1496,7 @@ $option_title_width: 180px;
 #id_realm_edit_topic_policy,
 #id_realm_message_content_edit_limit_seconds,
 #id_realm_delete_own_message_policy,
-#id_realm_msg_delete_limit_setting {
+#id_realm_message_content_delete_limit_seconds {
     width: 325px;
 }
 
diff --git a/static/templates/settings/organization_permissions_admin.hbs b/static/templates/settings/organization_permissions_admin.hbs
index 6fc9e25940..4badd3a864 100644
--- a/static/templates/settings/organization_permissions_admin.hbs
+++ b/static/templates/settings/organization_permissions_admin.hbs
@@ -198,12 +198,12 @@
                 </div>
 
                 <div class="input-group time-limit-setting">
-                    <label for="realm_msg_delete_limit_setting" class="dropdown-title">
+                    <label for="realm_message_content_delete_limit_seconds" class="dropdown-title">
                         {{t "Time limit for deleting messages" }}
                         <i class="fa fa-info-circle settings-info-icon tippy-zulip-tooltip"
                           aria-hidden="true" data-tippy-content="{{t 'Administrators can delete any message.' }}"></i>
                     </label>
-                    <select name="realm_msg_delete_limit_setting" id="id_realm_msg_delete_limit_setting" class="prop-element">
+                    <select name="realm_message_content_delete_limit_seconds" id="id_realm_message_content_delete_limit_seconds" class="prop-element">
                         {{#each msg_delete_limit_dropdown_values}}
                             <option value="{{0}}">{{1.text}}</option>
                         {{/each}}