diff --git a/src/invidious.cr b/src/invidious.cr
index 65846303..c43e2c78 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -1597,6 +1597,7 @@ get "/channel/:ucid" do |env|
 
   begin
     videos = extract_playlist(ucid, page)
+    videos.each { |a| a.playlists.clear }
   rescue ex
     error_message = ex.message
     next templated "error"
diff --git a/src/invidious/views/components/video.ecr b/src/invidious/views/components/video.ecr
index 7bf9a8a8..cbd3e106 100644
--- a/src/invidious/views/components/video.ecr
+++ b/src/invidious/views/components/video.ecr
@@ -1,6 +1,6 @@
 <div class="pure-u-1 pure-u-md-1-4">
     <div class="h-box">
-        <% if video.responds_to?(:playlists) %>
+        <% if video.responds_to?(:playlists) && !video.playlists.empty? %>
         <% params = "&list=#{video.playlists[0]}" %>
         <% else %>
         <% params = nil %>