diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 7669a8d3f..468c97f72 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -8796,12 +8796,8 @@ void ContactsManager::on_get_user(tl_object_ptr<telegram_api::User> &&user_ptr,
 
   int32 bot_info_version = has_bot_info_version ? user->bot_info_version_ : -1;
   if (u->emoji_status != emoji_status) {
-    if ((u->is_premium ? u->emoji_status : EmojiStatus()) != (is_premium ? emoji_status : EmojiStatus())) {
-      u->is_changed = true;
-    } else {
-      u->need_save_to_database = true;
-    }
     u->emoji_status = emoji_status;
+    u->is_emoji_status_changed = true;
   }
   if (is_verified != u->is_verified || is_premium != u->is_premium || is_support != u->is_support ||
       is_bot != u->is_bot || can_join_groups != u->can_join_groups ||
@@ -10333,6 +10329,16 @@ void ContactsManager::update_user(User *u, UserId user_id, bool from_binlog, boo
     }
     u->is_phone_number_changed = false;
   }
+  if (u->is_emoji_status_changed) {
+    auto effective_custom_emoji_id = u->emoji_status.get_effective_custom_emoji_id(u->is_premium);
+    if (effective_custom_emoji_id != u->last_sent_emoji_status) {
+      u->last_sent_emoji_status = effective_custom_emoji_id;
+      u->is_changed = true;
+    } else {
+      u->need_save_to_database = true;
+    }
+    u->is_emoji_status_changed = false;
+  }
   if (u->is_status_changed && user_id != get_my_id()) {
     auto left_time = get_user_was_online(u, user_id) - G()->server_time_cached();
     if (left_time >= 0 && left_time < 30 * 86400) {
@@ -11771,12 +11777,8 @@ void ContactsManager::on_update_user_emoji_status(UserId user_id,
 void ContactsManager::on_update_user_emoji_status(User *u, UserId user_id, EmojiStatus emoji_status) {
   if (u->emoji_status != emoji_status) {
     u->emoji_status = emoji_status;
+    u->is_emoji_status_changed = true;
     LOG(DEBUG) << "Emoji status has changed for " << user_id;
-    if (u->is_premium) {
-      u->is_changed = true;
-    } else {
-      u->need_save_to_database = true;
-    }
   }
 }
 
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 243193f2e..533980644 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -646,6 +646,7 @@ class ContactsManager final : public Actor {
     string phone_number;
     int64 access_hash = -1;
     EmojiStatus emoji_status;
+    int64 last_sent_emoji_status = 0;
 
     ProfilePhoto photo;
 
@@ -692,6 +693,7 @@ class ContactsManager final : public Actor {
     bool is_username_changed = true;
     bool is_photo_changed = true;
     bool is_phone_number_changed = true;
+    bool is_emoji_status_changed = true;
     bool is_is_contact_changed = true;
     bool is_is_deleted_changed = true;
     bool is_changed = true;             // have new changes that need to be sent to the client and database
diff --git a/td/telegram/EmojiStatus.cpp b/td/telegram/EmojiStatus.cpp
index ee54329a6..8bdea56be 100644
--- a/td/telegram/EmojiStatus.cpp
+++ b/td/telegram/EmojiStatus.cpp
@@ -217,6 +217,10 @@ td_api::object_ptr<td_api::premiumStatus> EmojiStatus::get_premium_status_object
   return td_api::make_object<td_api::premiumStatus>(custom_emoji_id_);
 }
 
+int64 EmojiStatus::get_effective_custom_emoji_id(bool is_premium) const {
+  return is_premium ? 0 : custom_emoji_id_;
+}
+
 StringBuilder &operator<<(StringBuilder &string_builder, const EmojiStatus &emoji_status) {
   if (emoji_status.is_empty()) {
     return string_builder << "DefaultProfileBadge";
diff --git a/td/telegram/EmojiStatus.h b/td/telegram/EmojiStatus.h
index 34d52106b..7bd558e8a 100644
--- a/td/telegram/EmojiStatus.h
+++ b/td/telegram/EmojiStatus.h
@@ -36,6 +36,8 @@ class EmojiStatus {
 
   td_api::object_ptr<td_api::premiumStatus> get_premium_status_object() const;
 
+  int64 get_effective_custom_emoji_id(bool is_premium) const;
+
   bool is_empty() const {
     return custom_emoji_id_ == 0;
   }