diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index fc05c7fbba..ced24a53f3 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -783,7 +783,10 @@ ReplyKeyboard::ReplyKeyboard(
 					auto result = TextWithEntities();
 					if (const auto iconId = row[j].visual.iconId) {
 						using namespace Data;
-						result.append(SingleCustomEmoji(iconId)).append(' ');
+						result.append(SingleCustomEmoji(iconId));
+						if (!text.isEmpty()) {
+							result.append(' ');
+						}
 					}
 					if (type == Type::Buy) {
 						auto firstPart = true;