diff --git a/src/components/middle/composer/AttachmentModal.tsx b/src/components/middle/composer/AttachmentModal.tsx
index c7e9691fa..644ccc470 100644
--- a/src/components/middle/composer/AttachmentModal.tsx
+++ b/src/components/middle/composer/AttachmentModal.tsx
@@ -28,6 +28,8 @@ import EmojiTooltip from './EmojiTooltip.async';
 import './AttachmentModal.scss';
 
 export type OwnProps = {
+  chatId: string;
+  threadId: number;
   attachments: ApiAttachment[];
   caption: string;
   isReady?: boolean;
@@ -47,6 +49,8 @@ export type OwnProps = {
 const DROP_LEAVE_TIMEOUT_MS = 150;
 
 const AttachmentModal: FC<OwnProps> = ({
+  chatId,
+  threadId,
   attachments,
   caption,
   isReady,
@@ -246,13 +250,15 @@ const AttachmentModal: FC<OwnProps> = ({
           />
           <MessageInput
             id="caption-input-text"
+            chatId={chatId}
+            threadId={threadId}
             isAttachmentModalInput
             html={caption}
             editableInputId={EDITABLE_INPUT_MODAL_ID}
             placeholder={lang('Caption')}
             onUpdate={onCaptionUpdate}
             onSend={onSend}
-            shouldSetFocus={Boolean(attachments.length)}
+            canAutoFocus={Boolean(isReady && attachments.length)}
           />
         </div>
       </div>
diff --git a/src/components/middle/composer/Composer.tsx b/src/components/middle/composer/Composer.tsx
index 5aa6ac081..1b5fe6821 100644
--- a/src/components/middle/composer/Composer.tsx
+++ b/src/components/middle/composer/Composer.tsx
@@ -799,6 +799,8 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
         </Portal>
       )}
       <AttachmentModal
+        chatId={chatId}
+        threadId={threadId}
         attachments={attachments}
         caption={attachments.length ? html : ''}
         groupChatMembers={groupChatMembers}
@@ -899,6 +901,8 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
           )}
           <MessageInput
             id="message-input-text"
+            chatId={chatId}
+            threadId={threadId}
             html={!attachments.length ? html : ''}
             placeholder={
               activeVoiceRecording && windowWidth <= SCREEN_WIDTH_TO_HIDE_PLACEHOLDER
@@ -906,7 +910,7 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
                 : botKeyboardPlaceholder || lang('Message')
             }
             forcedPlaceholder={inlineBotHelp}
-            shouldSetFocus={!attachments.length}
+            canAutoFocus={isReady && !attachments.length}
             shouldSuppressFocus={IS_SINGLE_COLUMN_LAYOUT && isSymbolMenuOpen}
             shouldSuppressTextFormatter={isEmojiTooltipOpen || isMentionTooltipOpen || isInlineBotTooltipOpen}
             onUpdate={setHtml}
diff --git a/src/components/middle/composer/MessageInput.tsx b/src/components/middle/composer/MessageInput.tsx
index 75dea1251..92eaffdbf 100644
--- a/src/components/middle/composer/MessageInput.tsx
+++ b/src/components/middle/composer/MessageInput.tsx
@@ -8,7 +8,7 @@ import { GlobalActions } from '../../../global/types';
 import { IAnchorPosition, ISettings } from '../../../types';
 
 import { EDITABLE_INPUT_ID } from '../../../config';
-import { selectCurrentMessageList, selectReplyingToId } from '../../../modules/selectors';
+import { selectReplyingToId } from '../../../modules/selectors';
 import { debounce } from '../../../util/schedulers';
 import focusEditableElement from '../../../util/focusEditableElement';
 import buildClassName from '../../../util/buildClassName';
@@ -34,12 +34,14 @@ const TRANSITION_DURATION_FACTOR = 50;
 
 type OwnProps = {
   id: string;
+  chatId: string;
+  threadId: number;
   isAttachmentModalInput?: boolean;
   editableInputId?: string;
   html: string;
   placeholder: string;
   forcedPlaceholder?: string;
-  shouldSetFocus: boolean;
+  canAutoFocus: boolean;
   shouldSuppressFocus?: boolean;
   shouldSuppressTextFormatter?: boolean;
   onUpdate: (html: string) => void;
@@ -48,7 +50,7 @@ type OwnProps = {
 };
 
 type StateProps = {
-  currentChatId?: string;
+  chatId?: string;
   replyingToId?: number;
   noTabCapture?: boolean;
   messageSendKeyCombo?: ISettings['messageSendKeyCombo'];
@@ -77,18 +79,18 @@ function clearSelection() {
 
 const MessageInput: FC<OwnProps & StateProps & DispatchProps> = ({
   id,
+  chatId,
   isAttachmentModalInput,
   editableInputId,
   html,
   placeholder,
   forcedPlaceholder,
-  shouldSetFocus,
+  canAutoFocus,
   shouldSuppressFocus,
   shouldSuppressTextFormatter,
   onUpdate,
   onSuppressedFocus,
   onSend,
-  currentChatId,
   replyingToId,
   noTabCapture,
   messageSendKeyCombo,
@@ -125,6 +127,8 @@ const MessageInput: FC<OwnProps & StateProps & DispatchProps> = ({
     }
   }, [html]);
 
+  const chatIdRef = useRef(chatId);
+  chatIdRef.current = chatId;
   const focusInput = useCallback(() => {
     if (isHeavyAnimating()) {
       setTimeout(focusInput, FOCUS_DELAY_MS);
@@ -335,10 +339,10 @@ const MessageInput: FC<OwnProps & StateProps & DispatchProps> = ({
       return;
     }
 
-    if (shouldSetFocus) {
+    if (canAutoFocus) {
       focusInput();
     }
-  }, [currentChatId, focusInput, replyingToId, shouldSetFocus]);
+  }, [chatId, focusInput, replyingToId, canAutoFocus]);
 
   useEffect(() => {
     if (noTabCapture) {
@@ -407,14 +411,12 @@ const MessageInput: FC<OwnProps & StateProps & DispatchProps> = ({
 };
 
 export default memo(withGlobal<OwnProps>(
-  (global): StateProps => {
-    const { chatId: currentChatId, threadId } = selectCurrentMessageList(global) || {};
+  (global, { chatId, threadId }: OwnProps): StateProps => {
     const { messageSendKeyCombo } = global.settings.byKey;
 
     return {
-      currentChatId,
       messageSendKeyCombo,
-      replyingToId: currentChatId && threadId ? selectReplyingToId(global, currentChatId, threadId) : undefined,
+      replyingToId: chatId && threadId ? selectReplyingToId(global, chatId, threadId) : undefined,
       noTabCapture: global.isPollModalOpen || global.payment.isPaymentModalOpen,
     };
   },