diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift
index aa2f57ac1..4bb5df495 100644
--- a/Frameworks/Account/Account.swift
+++ b/Frameworks/Account/Account.swift
@@ -388,8 +388,6 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
 		feed.name = name
 		feed.homePageURL = homePageURL
 		
-		addFeed(feed)
-		
 		return feed
 		
 	}
diff --git a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
index 1e172fde2..bb9294869 100644
--- a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
+++ b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
@@ -377,7 +377,6 @@ final class FeedbinAccountDelegate: AccountDelegate {
 				case .success(let taggingID):
 					DispatchQueue.main.async {
 						self.saveFolderRelationship(for: feed, withFolderName: folder.name ?? "", id: String(taggingID))
-						account.removeFeed(feed)
 						folder.addFeed(feed)
 						completion(.success(()))
 					}
diff --git a/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift b/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift
index 1a35a1796..51e2c4879 100644
--- a/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift
+++ b/Frameworks/Account/LocalAccount/LocalAccountDelegate.swift
@@ -138,11 +138,10 @@ final class LocalAccountDelegate: AccountDelegate {
 	}
 	
 	func addFeed(for account: Account, to container: Container, with feed: Feed, completion: @escaping (Result<Void, Error>) -> Void) {
-		if let account = container as? Account {
-			account.addFeed(feed)
-		}
 		if let folder = container as? Folder {
 			folder.addFeed(feed)
+		} else if let account = container as? Account {
+			account.addFeed(feed)
 		}
 		completion(.success(()))
 	}