diff --git a/README.md b/README.md
index 080584559..2641edc6b 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ This repository contains the code of the Telegram Database library (`TDLib`).
 * **Fully-asynchronous**: requests to `TDLib` don't block each other or anything else, responses will be sent when they are available.
 
 <a name="license"></a>
-## License 
+## License
 The Telegram Database library is licensed under the terms of the
 Boost Software License. See [LICENSE](http://www.boost.org/LICENSE_1_0.txt) for more information.
 
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index a4dfef033..9869e877a 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -21478,6 +21478,10 @@ void MessagesManager::update_message(Dialog *d, unique_ptr<Message> &old_message
         ((old_message->reply_markup == nullptr) != (new_message->reply_markup == nullptr)) ||
         (old_message->reply_markup != nullptr && *old_message->reply_markup != *new_message->reply_markup);
     if (reply_markup_changed) {
+      if (d->reply_markup_message_id == message_id && !td_->auth_manager_->is_bot() &&
+          new_message->reply_markup == nullptr) {
+        set_dialog_reply_markup(d, MessageId());
+      }
       old_message->reply_markup = std::move(new_message->reply_markup);
       is_edited = true;
       is_changed = true;