diff --git a/src/invidious/channels/channels.cr b/src/invidious/channels/channels.cr
index c7bbf7ea..fe8d5fe9 100644
--- a/src/invidious/channels/channels.cr
+++ b/src/invidious/channels/channels.cr
@@ -180,8 +180,8 @@ def fetch_channel(ucid, pull_all_videos : Bool)
       title:              channel_video.title,
       published:          channel_video.published,
       updated:            Time.utc,
-      ucid:               channel.id,
-      author:             channel.author,
+      ucid:               channel_info.auto_generated ? channel_video.ucid : channel.id,
+      author:             channel_info.auto_generated ? channel_video.author : channel.author,
       length_seconds:     channel_video.length_seconds,
       live_now:           channel_video.badges.live_now?,
       premiere_timestamp: channel_video.premiere_timestamp,