diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift
index 5f1c90fce..c6d36f8fc 100644
--- a/Frameworks/Account/Feed.swift
+++ b/Frameworks/Account/Feed.swift
@@ -151,8 +151,8 @@ public final class Feed: DisplayNameProvider, Renamable, UnreadCountProvider, Ha
 	// MARK: - Renamable
 
 	public func rename(to newName: String, completion: @escaping (Result<Void, Error>) -> Void) {
-		editedName = newName
-		completion(.success(()))
+		guard let account = account else { return }
+		account.renameFeed(self, to: newName, completion: completion)
 	}
 
 	// MARK: - UnreadCountProvider
diff --git a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
index af201b0dd..c010df427 100644
--- a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
+++ b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
@@ -100,9 +100,15 @@ extension SidebarViewController: RenameWindowControllerDelegate {
 	func renameWindowController(_ windowController: RenameWindowController, didRenameObject object: Any, withNewName name: String) {
 
 		if let feed = object as? Feed {
-			feed.editedName = name
-		}
-		else if let folder = object as? Folder {
+			feed.rename(to: name) { result in
+				switch result {
+				case .success:
+					break
+				case .failure(let error):
+					NSApplication.shared.presentError(error)
+				}
+			}
+		} else if let folder = object as? Folder {
 			folder.rename(to: name) { result in
 				switch result {
 				case .success: