diff --git a/src/invidious.cr b/src/invidious.cr
index 8d21a2c4..dc61c105 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -401,12 +401,17 @@ get "/playlist" do |env|
 
   begin
     playlist = fetch_playlist(plid)
-    videos = fetch_playlist_videos(plid, page, playlist.video_count)
   rescue ex
     error_message = ex.message
     next templated "error"
   end
 
+  begin
+    videos = fetch_playlist_videos(plid, page, playlist.video_count)
+  rescue ex
+    videos = [] of PlaylistVideo
+  end
+
   templated "playlist"
 end
 
@@ -2872,12 +2877,17 @@ get "/api/v1/playlists/:plid" do |env|
 
   begin
     playlist = fetch_playlist(plid)
-    videos = fetch_playlist_videos(plid, page, playlist.video_count)
   rescue ex
     error_message = {"error" => "Playlist is empty"}.to_json
     halt env, status_code: 404, response: error_message
   end
 
+  begin
+    videos = fetch_playlist_videos(plid, page, playlist.video_count)
+  rescue ex
+    videos = [] of PlaylistVideo
+  end
+
   response = JSON.build do |json|
     json.object do
       json.field "title", playlist.title