diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index bd22a5928..9163f2a0e 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -9895,8 +9895,12 @@ void MessagesManager::delete_all_channel_messages_from_user_on_server(ChannelId
 }
 
 int32 MessagesManager::get_unload_dialog_delay() const {
-  constexpr int32 DIALOG_UNLOAD_DELAY = 60;       // seconds
-  constexpr int32 DIALOG_UNLOAD_BOT_DELAY = 600;  // seconds
+  constexpr int32 DIALOG_UNLOAD_DELAY = 60;        // seconds
+  constexpr int32 DIALOG_UNLOAD_BOT_DELAY = 1800;  // seconds
+  auto custom_unload_delay = clamp(G()->shared_config().get_option_integer("dialog_unload_delay", -1), -1, 86400);
+  if (custom_unload_delay != -1) {
+    return custom_unload_delay;
+  }
   return td_->auth_manager_->is_bot() ? DIALOG_UNLOAD_BOT_DELAY : DIALOG_UNLOAD_DELAY;
 }
 
@@ -13558,7 +13562,8 @@ void MessagesManager::dump_debug_message_op(const Dialog *d, int priority) {
 }
 
 bool MessagesManager::is_message_unload_enabled() const {
-  return G()->parameters().use_message_db || td_->auth_manager_->is_bot();
+  auto has_custom_unload_time = clamp(G()->shared_config().get_option_integer("unload_messages_after_seconds", -1), -1, 86400) != -1;
+  return G()->parameters().use_message_db || td_->auth_manager_->is_bot() || has_custom_unload_time;
 }
 
 bool MessagesManager::can_unload_message(const Dialog *d, const Message *m) const {
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index d504b35c5..8f5857ddf 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -7077,6 +7077,9 @@ void Td::on_request(uint64 id, td_api::setOption &request) {
       }
       break;
     case 'd':
+      if (set_integer_option("dialog_unload_delay")) {
+        return;
+      }
       if (!is_bot && set_boolean_option("disable_contact_registered_notifications")) {
         return;
       }