diff --git a/src/components/middle/MessageList.tsx b/src/components/middle/MessageList.tsx
index e0c44d00c..aeac2fef6 100644
--- a/src/components/middle/MessageList.tsx
+++ b/src/components/middle/MessageList.tsx
@@ -288,7 +288,7 @@ const MessageList: FC<OwnProps & StateProps> = ({
   }, [messageIds, messagesById, threadFirstMessageId, threadTopMessageId, type, isServiceNotificationsChat]);
 
   useInterval(() => {
-    if (!messageIds || !messagesById) {
+    if (!messageIds || !messagesById || type === 'scheduled') {
       return;
     }
     const ids = messageIds.filter((id) => messagesById[id]?.reactions);
@@ -299,7 +299,7 @@ const MessageList: FC<OwnProps & StateProps> = ({
   }, MESSAGE_REACTIONS_POLLING_INTERVAL);
 
   useInterval(() => {
-    if (!messageIds || !messagesById || threadId !== MAIN_THREAD_ID) {
+    if (!messageIds || !messagesById || threadId !== MAIN_THREAD_ID || type === 'scheduled') {
       return;
     }
     const ids = messageIds.filter((id) => messagesById[id]?.repliesThreadInfo?.isComments
diff --git a/src/components/middle/MessageListContent.tsx b/src/components/middle/MessageListContent.tsx
index e67a07502..ba3d6a37c 100644
--- a/src/components/middle/MessageListContent.tsx
+++ b/src/components/middle/MessageListContent.tsx
@@ -223,7 +223,7 @@ const MessageListContent: FC<OwnProps> = ({
             threadId={threadId}
             messageListType={type}
             noComments={noComments}
-            noReplies={!noComments || threadId !== MAIN_THREAD_ID}
+            noReplies={!noComments || threadId !== MAIN_THREAD_ID || type === 'scheduled'}
             appearanceOrder={messageCountToAnimate - ++appearanceIndex}
             isJustAdded={position.isLastInList && isNewMessage}
             isFirstInGroup={position.isFirstInGroup}
diff --git a/src/global/actions/apiUpdaters/messages.ts b/src/global/actions/apiUpdaters/messages.ts
index bdcc5eb25..3772b5cf8 100644
--- a/src/global/actions/apiUpdaters/messages.ts
+++ b/src/global/actions/apiUpdaters/messages.ts
@@ -56,7 +56,7 @@ import {
   selectTabState,
 } from '../../selectors';
 import {
-  getMessageContent, isUserId, isMessageLocal, getMessageText, checkIfHasUnreadReactions,
+  getMessageContent, isUserId, isMessageLocal, getMessageText, checkIfHasUnreadReactions, isActionMessage,
 } from '../../helpers';
 import { onTickEnd } from '../../../util/schedulers';
 import { updateUnreadReactions } from '../../reducers/reactions';
@@ -810,7 +810,7 @@ function updateListedAndViewportIds<T extends GlobalState>(
       lastMessageId: message.id,
     });
 
-    if (!isMessageLocal(message)) {
+    if (!isMessageLocal(message) && !isActionMessage(message)) {
       global = updateThreadInfo(global, chatId, threadInfo.threadId, {
         messagesCount: (threadInfo.messagesCount || 0) + 1,
       });