diff --git a/TwitchDownloaderCore/Chat/ChatJson.cs b/TwitchDownloaderCore/Chat/ChatJson.cs
index b4b6ccd6..05fe734e 100644
--- a/TwitchDownloaderCore/Chat/ChatJson.cs
+++ b/TwitchDownloaderCore/Chat/ChatJson.cs
@@ -199,9 +199,12 @@ private static async Task UpgradeChatJson(ChatRoot chatRoot)
 
                 if (!int.TryParse(chatRoot.video.user_id, out var assumedId))
                 {
-                    if (!int.TryParse(broadcaster.Value?.commenter._id, out assumedId))
+                    if (chatRoot.comments.FirstOrDefault(x => int.TryParse(x.channel_id, out assumedId)) is null)
                     {
-                        assumedId = 0;
+                        if (!int.TryParse(broadcaster.Value?.commenter._id, out assumedId))
+                        {
+                            assumedId = 0;
+                        }
                     }
                 }