diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index dc0f7ca268..94cbaec5d4 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -560,12 +560,11 @@ static struct timeline_par *build_timeline(struct timeline *root,
     if (!tl->track_layout && !tl->delay_open)
         goto error;
     if (!root->meta)
-        root->meta = tl->track_layout;
+        root->meta = tl->track_layout ? tl->track_layout : root->demuxer;
 
     // Not very sane, since demuxer fields are supposed to be treated read-only
     // from outside, but happens to work in this case, so who cares.
-    if (root->meta)
-        mp_tags_merge(root->meta->metadata, edl_root->tags);
+    mp_tags_merge(root->meta->metadata, edl_root->tags);
 
     mp_assert(tl->num_parts == parts->num_parts);
     return tl;
diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
index 5a2f25e9d7..8deed3f8a2 100644
--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
@@ -62,7 +62,6 @@ local tag_list = {
     ["release_year"]    = "ytdl_release_year",
     ["description"]     = "ytdl_description",
     -- "title" is handled by force-media-title
-    -- tags don't work with all_formats=yes
 }
 
 local safe_protos = Set {