diff --git a/Frameworks/Account/AccountMetadataFile.swift b/Frameworks/Account/AccountMetadataFile.swift
index cb1aaed5d..03b5ccf7e 100644
--- a/Frameworks/Account/AccountMetadataFile.swift
+++ b/Frameworks/Account/AccountMetadataFile.swift
@@ -48,8 +48,8 @@ private extension AccountMetadataFile {
 			if let fileData = try? Data(contentsOf: readURL) {
 				let decoder = PropertyListDecoder()
 				account.metadata = (try? decoder.decode(AccountMetadata.self, from: fileData)) ?? AccountMetadata()
-				account.metadata.delegate = account
 			}
+			account.metadata.delegate = account
 		})
 		
 		if let error = errorPointer?.pointee {
diff --git a/Frameworks/Account/FeedMetadataFile.swift b/Frameworks/Account/FeedMetadataFile.swift
index a602819b6..42fb8a460 100644
--- a/Frameworks/Account/FeedMetadataFile.swift
+++ b/Frameworks/Account/FeedMetadataFile.swift
@@ -48,10 +48,10 @@ private extension FeedMetadataFile {
 			if let fileData = try? Data(contentsOf: readURL) {
 				let decoder = PropertyListDecoder()
 				account.feedMetadata = (try? decoder.decode(Account.FeedMetadataDictionary.self, from: fileData)) ?? Account.FeedMetadataDictionary()
-				account.feedMetadata.values.forEach { $0.delegate = account }
-				if !account.startingUp {
-					account.resetFeedMetadataAndUnreadCounts()
-				}
+			}
+			account.feedMetadata.values.forEach { $0.delegate = account }
+			if !account.startingUp {
+				account.resetFeedMetadataAndUnreadCounts()
 			}
 		})