diff --git a/components/streams/src/feed.cpp b/components/streams/src/feed.cpp
index 4044c9c3b0f38463bbf9b79e60078f2780b8a274..8ccae3a1853aad831ca198d91c9883ff8227bc59 100644
--- a/components/streams/src/feed.cpp
+++ b/components/streams/src/feed.cpp
@@ -521,7 +521,7 @@ std::string Feed::getName(const std::string &puri) {
 			auto n = net_->findOne<std::string>("get_cfg", puri);
 			if (n) {
 				auto j = nlohmann::json::parse(*n);
-				return (j.is_structured()) ? j.value("name", j.value("uri", "No Name")) : "No Name";
+				return (j.is_structured()) ? j.value("name", j.value("uri", uri.getPathSegment(-1))) : uri.getPathSegment(-1);
 			}
 		} catch (const ftl::exception &e) {
 			e.ignore();
@@ -540,7 +540,7 @@ std::string Feed::getName(const std::string &puri) {
 		return getConfig()["recent_files"][uri.getBaseURI()].value("name", "FTLFile");
 	}
 
-	return "No Name";
+	return uri.getPathSegment(-1);
 }
 
 void Feed::add(uint32_t fsid, const std::string &uri, ftl::stream::Stream* stream) {