diff --git a/src/modules/Thread/components/ParentMessageInfo/ParentMessageInfoItem.scss b/src/modules/Thread/components/ParentMessageInfo/ParentMessageInfoItem.scss
index 387a4e4f0..ed60f7953 100644
--- a/src/modules/Thread/components/ParentMessageInfo/ParentMessageInfoItem.scss
+++ b/src/modules/Thread/components/ParentMessageInfo/ParentMessageInfoItem.scss
@@ -80,7 +80,7 @@
   width: 56px;
 }
 
-.sendbird-parent-message-info-item__thumbnail-message__image-cover {;
+.sendbird-parent-message-info-item__thumbnail-message__image-cover {
   background-color: var(--sendbird-light-overlay-01);
   border-radius: 16px;
   display: none;
diff --git a/src/modules/Thread/context/ThreadProvider.tsx b/src/modules/Thread/context/ThreadProvider.tsx
index 92c5c95a1..ba7851712 100644
--- a/src/modules/Thread/context/ThreadProvider.tsx
+++ b/src/modules/Thread/context/ThreadProvider.tsx
@@ -16,6 +16,8 @@ import threadReducer from './dux/reducer';
 import { ThreadContextActionTypes } from './dux/actionTypes';
 import threadInitialState, { ThreadContextInitialState } from './dux/initialState';
 
+import type { OnBeforeDownloadFileMessageType } from '../../GroupChannel/context/GroupChannelProvider';
+import type { ChannelStateTypes, ParentMessageStateTypes, ThreadListStateTypes } from '../types';
 import useGetChannel from './hooks/useGetChannel';
 import useGetAllEmoji from './hooks/useGetAllEmoji';
 import useGetParentMessage from './hooks/useGetParentMessage';
@@ -31,7 +33,6 @@ import useSendVoiceMessageCallback from './hooks/useSendVoiceMessageCallback';
 import { PublishingModuleType, useSendMultipleFilesMessage } from './hooks/useSendMultipleFilesMessage';
 import { SendableMessageType } from '../../../utils';
 import { useThreadFetchers } from './hooks/useThreadFetchers';
-import type { OnBeforeDownloadFileMessageType } from '../../GroupChannel/context/GroupChannelProvider';
 import { useMessageLayoutDirection } from '../../../hooks/useHTMLTextDirection';
 
 export interface ThreadProviderProps extends
@@ -165,8 +166,9 @@ export const ThreadProvider = (props: ThreadProviderProps) => {
   useMessageLayoutDirection(
     htmlTextDirection,
     forceLeftToRightMessageLayout,
-    // we're assuming that if the thread message list is empty, it's in the loading state
-    allThreadMessages.length === 0,
+    channelState === ChannelStateTypes.LOADING
+    || threadListState === ThreadListStateTypes.LOADING
+    || parentMessageState === ParentMessageStateTypes.LOADING,
   );
 
   const toggleReaction = useToggleReactionCallback({ currentChannel }, { logger });