diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index a443315f04..b8ec2414af 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -430,12 +430,17 @@ bool AddRescheduleMessageAction(
 			? SendMenuType::ScheduledToUser
 			: SendMenuType::Scheduled;
 
+		using S = Data::ScheduledMessages;
+		const auto date = (item->date() == S::kScheduledUntilOnlineTimestamp)
+			? HistoryView::DefaultScheduleTime()
+			: item->date() + 600;
+
 		Ui::show(
 			HistoryView::PrepareScheduleBox(
 				&request.navigation->session(),
 				sendMenuType,
 				callback,
-			item->date() + 600),
+				date),
 			Ui::LayerOption::KeepOther);
 	});
 	return true;