diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr
index 7cfd38db..693cef48 100644
--- a/src/invidious/views/components/item.ecr
+++ b/src/invidious/views/components/item.ecr
@@ -31,9 +31,13 @@
                 <% end %>
                 <p dir="auto"><%= HTML.escape(item.title) %></p>
             </a>
-            <a href="/channel/<%= item.ucid %>">
+            <% if !item.ucid.to_s.empty? %>
+                <a href="/channel/<%= item.ucid %>">
+                    <p dir="auto"><b><%= HTML.escape(item.author) %><% if !item.is_a?(InvidiousPlaylist) && !item.author_verified.nil? && item.author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></b></p>
+                </a>
+            <% else %>
                 <p dir="auto"><b><%= HTML.escape(item.author) %><% if !item.is_a?(InvidiousPlaylist) && !item.author_verified.nil? && item.author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></b></p>
-            </a>
+            <% end %>
         <% when MixVideo %>
             <a href="/watch?v=<%= item.id %>&list=<%= item.rdid %>">
                 <% if !env.get("preferences").as(Preferences).thin_mode %>
@@ -51,9 +55,13 @@
                 <% end %>
                 <p dir="auto"><%= HTML.escape(item.title) %></p>
             </a>
-            <a href="/channel/<%= item.ucid %>">
+            <% if !item.ucid.to_s.empty? %>
+                <a href="/channel/<%= item.ucid %>">
+                    <p dir="auto"><b><%= HTML.escape(item.author) %></b></p>
+                </a>
+            <% else %>
                 <p dir="auto"><b><%= HTML.escape(item.author) %></b></p>
-            </a>
+            <% end %>
         <% when PlaylistVideo %>
             <a style="width:100%" href="/watch?v=<%= item.id %>&list=<%= item.plid %>&index=<%= item.index %>">
                 <% if !env.get("preferences").as(Preferences).thin_mode %>
@@ -85,9 +93,15 @@
             </a>
 
             <div class="video-card-row flexible">
-                <div class="flex-left"><a href="/channel/<%= item.ucid %>">
-                    <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %></p>
-                </a></div>
+                <div class="flex-left">
+                    <% if !item.ucid.to_s.empty? %>
+                        <a href="/channel/<%= item.ucid %>">
+                            <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %></p>
+                        </a>
+                    <% else %>
+                        <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %></p>
+                    <% end %>
+                </div>
                 <% endpoint_params = "?v=#{item.id}&list=#{item.plid}" %>
                 <%= rendered "components/video-context-buttons" %>
             </div>
@@ -147,9 +161,15 @@
             </a>
 
             <div class="video-card-row flexible">
-                <div class="flex-left"><a href="/channel/<%= item.ucid %>">
-                    <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %><% if !item.is_a?(ChannelVideo) && !item.author_verified.nil? && item.author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></p>
-                </a></div>
+                <div class="flex-left">
+                    <% if !item.ucid.to_s.empty? %>
+                        <a href="/channel/<%= item.ucid %>">
+                            <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %><% if !item.is_a?(ChannelVideo) && !item.author_verified.nil? && item.author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></p>
+                        </a>
+                    <% else %>
+                        <p class="channel-name" dir="auto"><%= HTML.escape(item.author) %><% if !item.is_a?(ChannelVideo) && !item.author_verified.nil? && item.author_verified %>&nbsp;<i class="icon ion ion-md-checkmark-circle"></i><% end %></p>
+                    <% end %>
+                </div>
 
                 <% endpoint_params = "?v=#{item.id}" %>
                 <%= rendered "components/video-context-buttons" %>
diff --git a/src/invidious/yt_backend/extractors.cr b/src/invidious/yt_backend/extractors.cr
index 6686e6e7..aa252b68 100644
--- a/src/invidious/yt_backend/extractors.cr
+++ b/src/invidious/yt_backend/extractors.cr
@@ -764,7 +764,7 @@ module HelperExtractors
   # Retrieves the ID required for querying the InnerTube browse endpoint.
   # Raises when it's unable to do so
   def self.get_browse_id(container)
-    return container.dig("navigationEndpoint", "browseEndpoint", "browseId").as_s
+    return container.dig?("navigationEndpoint", "browseEndpoint", "browseId").try &.as_s || ""
   end
 end