diff --git a/src/api/gramjs/methods/messages.ts b/src/api/gramjs/methods/messages.ts
index d8a3556cc..8209700aa 100644
--- a/src/api/gramjs/methods/messages.ts
+++ b/src/api/gramjs/methods/messages.ts
@@ -710,27 +710,15 @@ export async function deleteMessages({
   });
 }
 
-export async function deleteScheduledMessages({
+export function deleteScheduledMessages({
   chat, messageIds,
 }: {
   chat: ApiChat; messageIds: number[];
 }) {
-  const result = await invokeRequest(
-    new GramJs.messages.DeleteScheduledMessages({
-      peer: buildInputPeer(chat.id, chat.accessHash),
-      id: messageIds,
-    }),
-  );
-
-  if (!result) {
-    return;
-  }
-
-  onUpdate({
-    '@type': 'deleteScheduledMessages',
-    ids: messageIds,
-    chatId: chat.id,
-  });
+  invokeRequest(new GramJs.messages.DeleteScheduledMessages({
+    peer: buildInputPeer(chat.id, chat.accessHash),
+    id: messageIds,
+  }));
 }
 
 export async function deleteHistory({
diff --git a/src/components/middle/composer/Composer.tsx b/src/components/middle/composer/Composer.tsx
index 23c2493c0..5bfe64fd0 100644
--- a/src/components/middle/composer/Composer.tsx
+++ b/src/components/middle/composer/Composer.tsx
@@ -106,6 +106,7 @@ import useAttachmentModal from './hooks/useAttachmentModal';
 import useGetSelectionRange from '../../../hooks/useGetSelectionRange';
 import useDerivedState from '../../../hooks/useDerivedState';
 import { useStateRef } from '../../../hooks/useStateRef';
+import useEffectWithPrevDeps from '../../../hooks/useEffectWithPrevDeps';
 import useDraft from './hooks/useDraft';
 
 import DeleteMessageModal from '../../common/DeleteMessageModal.async';
@@ -886,8 +887,8 @@ const Composer: FC<OwnProps & StateProps> = ({
     }
   }, [handleSendAttachments, handleSend, sendInlineBotResult, sendMessage]);
 
-  useEffect(() => {
-    if (contentToBeScheduled) {
+  useEffectWithPrevDeps(([prevContentToBeScheduled]) => {
+    if (contentToBeScheduled && contentToBeScheduled !== prevContentToBeScheduled) {
       requestCalendar((scheduledAt) => {
         handleMessageSchedule(contentToBeScheduled, scheduledAt);
       });