diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 4b6f11425..1fbc8c898 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -1036,8 +1036,11 @@ struct ButtonWithEmoji {
 		}));
 	}) | rpl::flatten_latest(
 	) | rpl::start_with_next([=](DocumentData *icon) {
-		state->icon = icon;
-		right->update();
+		if (state->icon != icon) {
+			state->icon = icon;
+			state->custom = nullptr;
+			right->update();
+		}
 	}, right->lifetime());
 
 	return result;