diff --git a/src/invidious/routes/api/v1/feeds.cr b/src/invidious/routes/api/v1/feeds.cr
index fea2993c..ef297996 100644
--- a/src/invidious/routes/api/v1/feeds.cr
+++ b/src/invidious/routes/api/v1/feeds.cr
@@ -8,7 +8,7 @@ module Invidious::Routes::API::V1::Feeds
     trending_type = env.params.query["type"]?
 
     begin
-      trending, plid = fetch_trending(trending_type, region, locale)
+      trending, plid = fetch_trending(trending_type, region, locale, env)
     rescue ex
       return error_json(500, ex)
     end
diff --git a/src/invidious/routes/api/v1/videos.cr b/src/invidious/routes/api/v1/videos.cr
index 6a3eb8ae..6359d1e1 100644
--- a/src/invidious/routes/api/v1/videos.cr
+++ b/src/invidious/routes/api/v1/videos.cr
@@ -12,6 +12,11 @@ module Invidious::Routes::API::V1::Videos
 
     begin
       video = get_video(id, region: region)
+
+      user = env.get?("user").try &.as?(User)
+      if user && user.preferences.watch_history
+        Invidious::Database::Users.mark_watched(user, id)
+      end
     rescue ex : NotFoundException
       return error_json(404, ex)
     rescue ex
diff --git a/src/invidious/routes/feeds.cr b/src/invidious/routes/feeds.cr
index 070c96eb..6be422c8 100644
--- a/src/invidious/routes/feeds.cr
+++ b/src/invidious/routes/feeds.cr
@@ -52,7 +52,7 @@ module Invidious::Routes::Feeds
     region ||= env.get("preferences").as(Preferences).region
 
     begin
-      trending, plid = fetch_trending(trending_type, region, locale)
+      trending, plid = fetch_trending(trending_type, region, locale, env)
     rescue ex
       return error_template(500, ex)
     end
diff --git a/src/invidious/trending.cr b/src/invidious/trending.cr
index d14cde5d..aac5d2e1 100644
--- a/src/invidious/trending.cr
+++ b/src/invidious/trending.cr
@@ -1,4 +1,4 @@
-def fetch_trending(trending_type, region, locale)
+def fetch_trending(trending_type, region, locale, env)
   region ||= "US"
   region = region.upcase
 
@@ -13,6 +13,10 @@ def fetch_trending(trending_type, region, locale)
     params = "4gIKGgh0cmFpbGVycw%3D%3D"
   else # Default
     params = ""
+    suggested_videos = fetch_suggested_video_ids(env, region, locale)
+    if suggested_videos.size > 0
+      return suggested_videos
+    end
   end
 
   client_config = YoutubeAPI::ClientConfig.new(region: region)
@@ -40,3 +44,82 @@ def fetch_trending(trending_type, region, locale)
   # Deduplicate items before returning results
   return extracted.select(SearchVideo | ProblematicTimelineItem).uniq!(&.id), plid
 end
+
+def fetch_suggested_video_ids(env, region, locale)
+  user = env.get("user").as(Invidious::User)
+
+  if user.nil?
+    return [] of SearchVideo, nil
+  end
+
+  # Get some new videos from the subscription feed
+  channel_videos, _ = get_subscription_feed(user, 10, 1)
+  valid_channel_videoids = channel_videos.select do |v|
+    # Make sure the video is not live, not a premiere, has a length and has views
+    !v.live_now && v.premiere_timestamp.nil? && (v.length_seconds || 0) > 0 && (v.views || 0) > 0
+  end.map(&.id)
+
+  # Get the last 10 watched videos
+  watched_video_ids = user.watched.last(10)
+
+  video_ids = watched_video_ids + valid_channel_videoids.sample(4)
+  video_ids = video_ids.uniq
+  video_ids = video_ids.reject(&.nil?)
+  video_ids = video_ids.reject(&.empty?)
+
+  if video_ids.empty?
+    return [] of SearchVideo, nil
+  end
+
+  # Fetch related videos for each video and return 10 random ones
+  videos = [] of SearchVideo
+  video_ids.each do |video_id|
+    video = get_video(video_id)
+    next unless video.video_type == VideoType::Video
+
+    if !user.preferences.unseen_only || !user.watched.includes?(video.id)
+      videos << SearchVideo.new({
+        title:              video.title,
+        id:                 video.id,
+        author:             video.author,
+        ucid:               video.ucid || "",
+        published:          video.published || Time.utc,
+        views:              video.views || 0_i64,
+        description_html:   "", # not available
+        length_seconds:     video.length_seconds || 0,
+        premiere_timestamp: video.premiere_timestamp,
+        author_verified:    video.author_verified,
+        author_thumbnail:   video.author_thumbnail,
+        badges:             VideoBadges::None,
+      })
+    end
+
+    next unless video.related_videos
+
+    related = video.related_videos.sample(10)
+    related.each do |related_video|
+      next unless id = related_video["id"]?
+      next unless related_video["view_count"]? && related_video["view_count"]? != 0
+      next unless related_video["published"]?
+      next unless related_video["length_seconds"]? && related_video["length_seconds"]? != 0
+      next if user.preferences.unseen_only && user.watched.includes?(related_video["id"]?)
+      
+      videos << SearchVideo.new({
+        title:              related_video["title"],
+        id:                 id,
+        author:             related_video["author"],
+        ucid:               related_video["ucid"]? || "",
+        published:          (Time.parse_rfc3339(related_video["published"].to_s) rescue Time.utc),
+        views:              related_video["view_count"]?.try &.to_i64 || 0_i64,
+        description_html:   "", # not available
+        length_seconds:     related_video["length_seconds"]?.try &.to_i || 0,
+        premiere_timestamp: nil,
+        author_verified:    related_video["author_verified"]? == "true",
+        author_thumbnail:   related_video["author_thumbnail"]?,
+        badges:             VideoBadges::None,
+      })
+    end
+  end
+
+  return videos.shuffle.uniq(&.id), nil
+end