diff --git a/Frameworks/Account/CloudKit/CloudKitArticlesZone.swift b/Frameworks/Account/CloudKit/CloudKitArticlesZone.swift
index 6efe26fd0..411684452 100644
--- a/Frameworks/Account/CloudKit/CloudKitArticlesZone.swift
+++ b/Frameworks/Account/CloudKit/CloudKitArticlesZone.swift
@@ -30,7 +30,7 @@ final class CloudKitArticlesZone: CloudKitZone {
 		static let recordType = "Article"
 		struct Fields {
 			static let articleStatus = "articleStatus"
-			static let webFeedID = "webFeedID"
+			static let webFeedURL = "webFeedURL"
 			static let uniqueID = "uniqueID"
 			static let title = "title"
 			static let contentHTML = "contentHTML"
@@ -145,7 +145,7 @@ private extension CloudKitArticlesZone {
 
 		let articleStatusRecordID = CKRecord.ID(recordName: article.articleID, zoneID: Self.zoneID)
 		articleRecord[CloudKitArticle.Fields.articleStatus] = CKRecord.Reference(recordID: articleStatusRecordID, action: .deleteSelf)
-		articleRecord[CloudKitArticle.Fields.webFeedID] = article.webFeedID
+		articleRecord[CloudKitArticle.Fields.webFeedURL] = article.webFeed?.url
 		articleRecord[CloudKitArticle.Fields.uniqueID] = article.uniqueID
 		articleRecord[CloudKitArticle.Fields.title] = article.title
 		articleRecord[CloudKitArticle.Fields.contentHTML] = article.contentHTML
diff --git a/Frameworks/Account/CloudKit/CloudKitArticlesZoneDelegate.swift b/Frameworks/Account/CloudKit/CloudKitArticlesZoneDelegate.swift
index 53c30afc5..6b712b932 100644
--- a/Frameworks/Account/CloudKit/CloudKitArticlesZoneDelegate.swift
+++ b/Frameworks/Account/CloudKit/CloudKitArticlesZoneDelegate.swift
@@ -102,9 +102,9 @@ private extension CloudKitArticlesZoneDelegate {
 		}
 		
 		for receivedStarredArticle in receivedStarredArticles {
-			if let parsedItem = makeParsedItem(receivedStarredArticle), let statusRef = receivedStarredArticle[CloudKitArticlesZone.CloudKitArticle.Fields.articleStatus] as? CKRecord.Reference {
+			if let parsedItem = makeParsedItem(receivedStarredArticle) {
 				group.enter()
-				self.account?.update(statusRef.recordID.externalID, with: Set([parsedItem])) { databaseError in
+				self.account?.update(parsedItem.feedURL, with: Set([parsedItem])) { databaseError in
 					group.leave()
 					if let databaseError = databaseError {
 						os_log(.error, log: self.log, "Error occurred while storing starred items: %@", databaseError.localizedDescription)
@@ -134,13 +134,13 @@ private extension CloudKitArticlesZoneDelegate {
 		}
 		
 		guard let uniqueID = articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.uniqueID] as? String,
-			let feedURL = articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.webFeedID] as? String else {
+			let webFeedURL = articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.webFeedURL] as? String else {
 			return nil
 		}
 		
 		let parsedItem = ParsedItem(syncServiceID: nil,
 									uniqueID: uniqueID,
-									feedURL: feedURL,
+									feedURL: webFeedURL,
 									url: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.url] as? String,
 									externalURL: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.externalURL] as? String,
 									title: articleRecord[CloudKitArticlesZone.CloudKitArticle.Fields.title] as? String,