diff --git a/frontend_tests/node_tests/settings_org.js b/frontend_tests/node_tests/settings_org.js
index 330c787425..4782067eb2 100644
--- a/frontend_tests/node_tests/settings_org.js
+++ b/frontend_tests/node_tests/settings_org.js
@@ -234,7 +234,6 @@ function test_submit_settings_form(submit_form) {
     };
     $("#id_realm_create_stream_permission").val("by_anyone");
     $("#id_realm_add_emoji_by_admins_only").val("by_anyone");
-    $("#id_realm_message_retention_days").val("15");
     const bot_creation_policy_elem = $("#id_realm_bot_creation_policy");
     bot_creation_policy_elem.val("1");
     bot_creation_policy_elem.attr('id', 'id_realm_bot_creation_policy');
@@ -261,7 +260,6 @@ function test_submit_settings_form(submit_form) {
     let expected_value = {
         bot_creation_policy: '1',
         email_address_visibility: '1',
-        message_retention_days: '15',
         add_emoji_by_admins_only: false,
         create_stream_by_admins_only: false,
         waiting_period_threshold: 0,
diff --git a/static/js/settings_org.js b/static/js/settings_org.js
index 02ea55ee05..05f6e0df91 100644
--- a/static/js/settings_org.js
+++ b/static/js/settings_org.js
@@ -668,9 +668,7 @@ exports.build_page = function () {
                 data.message_content_delete_limit_seconds =
                     exports.msg_delete_limit_dropdown_values[delete_limit_setting_value].seconds;
             }
-        } else if (subsection === 'other_permissions') {
-            var create_stream_permission = $("#id_realm_create_stream_permission").val();
-            var add_emoji_permission = $("#id_realm_add_emoji_by_admins_only").val();
+        } else if (subsection == 'other_settings') {
             var new_message_retention_days = $("#id_realm_message_retention_days").val();
 
             if (parseInt(new_message_retention_days, 10).toString() !== new_message_retention_days
@@ -680,6 +678,9 @@ exports.build_page = function () {
 
             data.message_retention_days = new_message_retention_days !== "" ?
                 JSON.stringify(parseInt(new_message_retention_days, 10)) : null;
+        } else if (subsection === 'other_permissions') {
+            var create_stream_permission = $("#id_realm_create_stream_permission").val();
+            var add_emoji_permission = $("#id_realm_add_emoji_by_admins_only").val();
 
             if (add_emoji_permission === "by_admins_only") {
                 data.add_emoji_by_admins_only = true;