diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index b44bbaef0..6af46c30b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -167,8 +167,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QWindow>
 #include <QtCore/QMimeData>
 
-#include "data/stickers/data_custom_emoji.h"
-
 const char kOptionAutoScrollInactiveChat[] =
 	"auto-scroll-inactive-chat";
 
@@ -426,14 +424,10 @@ HistoryWidget::HistoryWidget(
 
 	_fieldAutocomplete->stickerChosen(
 	) | rpl::start_with_next([=](FieldAutocomplete::StickerChosen data) {
-		Data::InsertCustomEmoji(_field.data(), data.sticker);
-		AssertIsDebug();
-#if 0
 		controller->sendingAnimation().appendSending(
 			data.messageSendingFrom);
 		const auto localId = data.messageSendingFrom.localId;
 		sendExistingDocument(data.sticker, data.options, localId);
-#endif
 	}, lifetime());
 
 	_fieldAutocomplete->setModerateKeyActivateCallback([=](int key) {
@@ -1059,16 +1053,12 @@ void HistoryWidget::initTabbedSelector() {
 
 	selector->fileChosen(
 	) | filter | rpl::start_with_next([=](Selector::FileChosen data) {
-		Data::InsertCustomEmoji(_field.data(), data.document);
-		AssertIsDebug();
-#if 0
 		controller()->sendingAnimation().appendSending(
 			data.messageSendingFrom);
 		sendExistingDocument(
 			data.document,
 			data.options,
 			data.messageSendingFrom.localId);
-#endif
 	}, lifetime());
 
 	selector->photoChosen(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 24f0ec426..da4d23433 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -60,8 +60,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "mainwindow.h"
 
-#include "data/stickers/data_custom_emoji.h"
-
 namespace HistoryView {
 namespace {
 
@@ -1487,9 +1485,6 @@ void ComposeControls::initAutocomplete() {
 
 	_autocomplete->stickerChosen(
 	) | rpl::start_with_next([=](FieldAutocomplete::StickerChosen data) {
-		Data::InsertCustomEmoji(_field, data.sticker);
-		AssertIsDebug();
-#if 0
 		if (!_showSlowmodeError || !_showSlowmodeError()) {
 			setText({});
 		}
@@ -1502,7 +1497,6 @@ void ComposeControls::initAutocomplete() {
 			.options = data.options,
 			.messageSendingFrom = base::take(data.messageSendingFrom),
 		});
-#endif
 	}, _autocomplete->lifetime());
 
 	_autocomplete->choosingProcesses(
@@ -1835,13 +1829,7 @@ void ComposeControls::initTabbedSelector() {
 	}, wrap->lifetime());
 
 	selector->fileChosen(
-	) | rpl::start_with_next([=](const FileChosen &data) {
-		Data::InsertCustomEmoji(_field, data.document);
-		AssertIsDebug();
-	}, wrap->lifetime());
-#if 0
 	) | rpl::start_to_stream(_fileChosen, wrap->lifetime());
-#endif
 
 	selector->photoChosen(
 	) | rpl::start_to_stream(_photoChosen, wrap->lifetime());