diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index 3438ab15d..65a1cd6de 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -638,10 +638,11 @@ void DraftOptionsBox(
 	const auto &highlight = args.highlight;
 	const auto &clearOldDraft = args.clearOldDraft;
 	const auto resolveReply = [=] {
-		const auto current = state->quote.current();
 		auto result = draft.reply;
-		result.messageId = current.item->fullId();
-		result.quote = current.text;
+		if (const auto current = state->quote.current()) {
+			result.messageId = current.item->fullId();
+			result.quote = current.text;
+		}
 		return result;
 	};
 	const auto finish = [=](