diff --git a/app/actions/remote/preference.ts b/app/actions/remote/preference.ts
index f8a2b8073b..8d7c79f818 100644
--- a/app/actions/remote/preference.ts
+++ b/app/actions/remote/preference.ts
@@ -54,7 +54,6 @@ export const saveFavoriteChannel = async (serverUrl: string, channelId: string,
     }
 
     try {
-        // Todo: @shaz I think you'll need to add the category handler here so that the channel is added/removed from the favorites category
         const userId = await getCurrentUserId(operator.database);
         const favPref: PreferenceType = {
             category: CATEGORY_FAVORITE_CHANNEL,
diff --git a/app/actions/websocket/posts.ts b/app/actions/websocket/posts.ts
index d01ad8bd8d..82976d110f 100644
--- a/app/actions/websocket/posts.ts
+++ b/app/actions/websocket/posts.ts
@@ -128,10 +128,7 @@ export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessag
             ) {
                 markAsViewed = true;
                 markAsRead = false;
-            } else if ((post.channel_id === currentChannelId)) { // TODO: THREADS && !viewingGlobalThreads) {
-                // Don't mark as read if we're in global threads screen
-                // the currentChannelId still refers to previously viewed channel
-
+            } else if ((post.channel_id === currentChannelId)) {
                 const isChannelScreenMounted = NavigationStore.getNavigationComponents().includes(Screens.CHANNEL);
 
                 const isTabletDevice = await isTablet();