diff --git a/webapp/channels/src/components/post_view/post_list/index.tsx b/webapp/channels/src/components/post_view/post_list/index.tsx
index 3d532d1eef..72d44e02ad 100644
--- a/webapp/channels/src/components/post_view/post_list/index.tsx
+++ b/webapp/channels/src/components/post_view/post_list/index.tsx
@@ -36,7 +36,7 @@ const memoizedGetLatestPostId = memoizeResult((postIds: string[]) => getLatestPo
 
 interface Props {
     focusedPostId?: string;
-    unreadChunkTimeStamp: number;
+    unreadChunkTimeStamp?: number;
     changeUnreadChunkTimeStamp: (lastViewedAt: number) => void;
     channelId: string;
 }
@@ -75,7 +75,10 @@ function makeMapStateToProps() {
             atOldestPost = Boolean(chunk.oldest);
         }
 
-        const shouldHideNewMessageIndicator = shouldStartFromBottomWhenUnread && !isPostsChunkIncludingUnreadsPosts(state, chunk!, unreadChunkTimeStamp);
+        let shouldHideNewMessageIndicator = false;
+        if (unreadChunkTimeStamp != null) {
+            shouldHideNewMessageIndicator = shouldStartFromBottomWhenUnread && !isPostsChunkIncludingUnreadsPosts(state, chunk!, unreadChunkTimeStamp);
+        }
 
         if (postIds) {
             formattedPostIds = preparePostIdsForPostList(state, {postIds, lastViewedAt, indicateNewMessages: !shouldHideNewMessageIndicator});
diff --git a/webapp/channels/src/components/post_view/post_view.tsx b/webapp/channels/src/components/post_view/post_view.tsx
index 6bf78f3baa..a3fab27647 100644
--- a/webapp/channels/src/components/post_view/post_view.tsx
+++ b/webapp/channels/src/components/post_view/post_view.tsx
@@ -10,7 +10,7 @@ import {Preferences} from 'utils/constants';
 import PostList from './post_list';
 
 interface Props {
-    lastViewedAt: number;
+    lastViewedAt?: number;
     channelLoading: boolean;
     channelId: string;
     focusedPostId?: string;
@@ -18,7 +18,7 @@ interface Props {
 }
 
 interface State {
-    unreadChunkTimeStamp: number;
+    unreadChunkTimeStamp?: number;
     loaderForChangeOfPostsChunk: boolean;
     channelLoading: boolean;
     shouldStartFromBottomWhenUnread: boolean;