diff --git a/spec/invidious/videos/regular_videos_extract_spec.cr b/spec/invidious/videos/regular_videos_extract_spec.cr
index a6a3e60a..b35738f4 100644
--- a/spec/invidious/videos/regular_videos_extract_spec.cr
+++ b/spec/invidious/videos/regular_videos_extract_spec.cr
@@ -67,7 +67,7 @@ Spectator.describe "parse_video_info" do
     # Video metadata
 
     expect(info["genre"].as_s).to eq("Entertainment")
-    expect(info["genreUcid"].as_s).to be_empty
+    expect(info["genreUcid"].as_s).to be_nil
     expect(info["license"].as_s).to be_empty
 
     # Author infos
@@ -151,7 +151,7 @@ Spectator.describe "parse_video_info" do
     # Video metadata
 
     expect(info["genre"].as_s).to eq("Music")
-    expect(info["genreUcid"].as_s).to be_empty
+    expect(info["genreUcid"].as_s).to be_nil
     expect(info["license"].as_s).to be_empty
 
     # Author infos
diff --git a/spec/invidious/videos/scheduled_live_extract_spec.cr b/spec/invidious/videos/scheduled_live_extract_spec.cr
index 25e08c51..82dd8f00 100644
--- a/spec/invidious/videos/scheduled_live_extract_spec.cr
+++ b/spec/invidious/videos/scheduled_live_extract_spec.cr
@@ -94,7 +94,7 @@ Spectator.describe "parse_video_info" do
     # Video metadata
 
     expect(info["genre"].as_s).to eq("Entertainment")
-    expect(info["genreUcid"].as_s).to be_empty
+    expect(info["genreUcid"].as_s).to be_nil
     expect(info["license"].as_s).to be_empty
 
     # Author infos
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 5a4a55c3..cdfca02c 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -250,7 +250,7 @@ struct Video
   end
 
   def genre_url : String?
-    info["genreUcid"]? == "" ? nil : "/channel/#{info["genreUcid"]}"
+    info["genreUcid"].try &.as_s? ? "/channel/#{info["genreUcid"]}" : nil
   end
 
   def is_vr : Bool?
diff --git a/src/invidious/videos/parser.cr b/src/invidious/videos/parser.cr
index 0e1a947c..4bdb2512 100644
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@@ -424,7 +424,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
     "shortDescription" => JSON::Any.new(short_description.try &.as_s || nil),
     # Video metadata
     "genre"     => JSON::Any.new(genre.try &.as_s || ""),
-    "genreUcid" => JSON::Any.new(genre_ucid.try &.as_s || ""),
+    "genreUcid" => JSON::Any.new(genre_ucid.try &.as_s?),
     "license"   => JSON::Any.new(license.try &.as_s || ""),
     # Music section
     "music" => JSON.parse(music_list.to_json),