diff --git a/app/components/post_list/post_list.tsx b/app/components/post_list/post_list.tsx
index 2c9e91138..f0d49f1c3 100644
--- a/app/components/post_list/post_list.tsx
+++ b/app/components/post_list/post_list.tsx
@@ -195,8 +195,8 @@ const PostList = ({
         }
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
-            if (isViewable) {
-                acc[`${location}-${item.id}`] = true;
+            if (isViewable && item.type === 'post') {
+                acc[`${location}-${item.value.id}`] = true;
             }
             return acc;
         }, {});
diff --git a/app/screens/home/recent_mentions/recent_mentions.tsx b/app/screens/home/recent_mentions/recent_mentions.tsx
index b6c89c207..7c59be08e 100644
--- a/app/screens/home/recent_mentions/recent_mentions.tsx
+++ b/app/screens/home/recent_mentions/recent_mentions.tsx
@@ -114,8 +114,8 @@ const RecentMentionsScreen = ({appsEnabled, customEmojiNames, mentions, currentT
         }
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
-            if (isViewable) {
-                acc[`${Screens.MENTIONS}-${item.id}`] = true;
+            if (isViewable && item.type === 'post') {
+                acc[`${Screens.MENTIONS}-${item.value.id}`] = true;
             }
             return acc;
         }, {});
diff --git a/app/screens/home/saved_messages/saved_messages.tsx b/app/screens/home/saved_messages/saved_messages.tsx
index 92120f9d0..1a37ef6a6 100644
--- a/app/screens/home/saved_messages/saved_messages.tsx
+++ b/app/screens/home/saved_messages/saved_messages.tsx
@@ -109,8 +109,8 @@ function SavedMessages({appsEnabled, posts, currentTimezone, customEmojiNames, i
         }
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
-            if (isViewable) {
-                acc[`${Screens.SAVED_MESSAGES}-${item.id}`] = true;
+            if (isViewable && item.type === 'post') {
+                acc[`${Screens.SAVED_MESSAGES}-${item.value.id}`] = true;
             }
             return acc;
         }, {});
diff --git a/app/screens/pinned_messages/pinned_messages.tsx b/app/screens/pinned_messages/pinned_messages.tsx
index 291d24170..8ba8b63e9 100644
--- a/app/screens/pinned_messages/pinned_messages.tsx
+++ b/app/screens/pinned_messages/pinned_messages.tsx
@@ -85,8 +85,8 @@ function SavedMessages({
         }
 
         const viewableItemsMap = viewableItems.reduce((acc: Record<string, boolean>, {item, isViewable}) => {
-            if (isViewable) {
-                acc[`${Screens.PINNED_MESSAGES}-${item.id}`] = true;
+            if (isViewable && item.type === 'post') {
+                acc[`${Screens.PINNED_MESSAGES}-${item.value.id}`] = true;
             }
             return acc;
         }, {});