diff --git a/Frameworks/Account/Feed.swift b/Frameworks/Account/Feed.swift
index 36c1e6cac..945978437 100644
--- a/Frameworks/Account/Feed.swift
+++ b/Frameworks/Account/Feed.swift
@@ -231,8 +231,18 @@ public final class Feed: DisplayNameProvider, Renamable, UnreadCountProvider, Ha
 extension Feed: OPMLRepresentable {
 
 	public func OPMLString(indentLevel: Int) -> String {
-
-		let escapedName = nameForDisplay.rs_stringByEscapingSpecialXMLCharacters()
+		// https://github.com/brentsimmons/NetNewsWire/issues/527
+		// Don’t use nameForDisplay because that can result in a feed name "Untitled" written to disk,
+		// which NetNewsWire may take later to be the actual name.
+		var nameToUse = editedName
+		if nameToUse == nil {
+			nameToUse = name
+		}
+		if nameToUse == nil {
+			nameToUse = ""
+		}
+		let escapedName = nameToUse!.rs_stringByEscapingSpecialXMLCharacters()
+		
 		var escapedHomePageURL = ""
 		if let homePageURL = homePageURL {
 			escapedHomePageURL = homePageURL.rs_stringByEscapingSpecialXMLCharacters()