diff --git a/packages/api/src/resolvers/following/index.ts b/packages/api/src/resolvers/following/index.ts
index b4f3073bd..45d79eba5 100644
--- a/packages/api/src/resolvers/following/index.ts
+++ b/packages/api/src/resolvers/following/index.ts
@@ -137,7 +137,7 @@ export const addFollowingToLibraryResolver = authorized<
   return {
     __typename: 'AddFollowingToLibrarySuccess',
     articleSavingRequest: libraryItemToArticleSavingRequest(
-      item.user,
+      updatedItem.user,
       updatedItem
     ),
   }
diff --git a/packages/rss-handler/src/index.ts b/packages/rss-handler/src/index.ts
index 2d3efa45a..3eece1030 100644
--- a/packages/rss-handler/src/index.ts
+++ b/packages/rss-handler/src/index.ts
@@ -126,6 +126,19 @@ const sendUpdateSubscriptionMutation = async (
   }
 }
 
+const createTask = async (
+  userId: string,
+  feedUrl: string,
+  item: Item,
+  isFetchingContent: boolean
+) => {
+  if (isFetchingContent) {
+    return createSavingItemTask(userId, feedUrl, item)
+  }
+
+  return createFollowingTask(userId, feedUrl, item)
+}
+
 const createSavingItemTask = async (
   userId: string,
   feedUrl: string,
@@ -284,6 +297,7 @@ const processSubscription = async (
   lastFetchedAt: number,
   scheduledAt: number,
   lastFetchedChecksum: string,
+  isFetchingContent: boolean,
   feed: {
     lastBuildDate: any
     'syn:updatePeriod': any
@@ -366,7 +380,7 @@ const processSubscription = async (
       continue
     }
 
-    const created = await createFollowingTask(userId, feedUrl, item)
+    const created = await createTask(userId, feedUrl, item, isFetchingContent)
     if (!created) {
       console.error('Failed to create task for feed item', item.link)
       continue
@@ -389,7 +403,12 @@ const processSubscription = async (
     }
 
     // the feed has never been fetched, save at least the last valid item
-    const created = await createFollowingTask(userId, feedUrl, lastValidItem)
+    const created = await createTask(
+      userId,
+      feedUrl,
+      lastValidItem,
+      isFetchingContent
+    )
     if (!created) {
       console.error('Failed to create task for feed item', lastValidItem.link)
       throw new Error('Failed to create task for feed item')
@@ -435,6 +454,7 @@ export const rssHandler = Sentry.GCPFunction.wrapHttpFunction(
         scheduledTimestamps,
         userIds,
         lastFetchedChecksums,
+        isFetchingContents,
       } = req.body
       console.log('Processing feed', feedUrl)
 
@@ -452,6 +472,7 @@ export const rssHandler = Sentry.GCPFunction.wrapHttpFunction(
             lastFetchedTimestamps[i],
             scheduledTimestamps[i],
             lastFetchedChecksums[i],
+            isFetchingContents[i],
             feed
           )
         )