diff --git a/locales/en-US.json b/locales/en-US.json
index 9701a6213..5554b9286 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -471,5 +471,6 @@
     "crash_page_switch_instance": "tried to <a href=\"`x`\">use another instance</a>",
     "crash_page_read_the_faq": "read the <a href=\"`x`\">Frequently Asked Questions (FAQ)</a>",
     "crash_page_search_issue": "searched for <a href=\"`x`\">existing issues on GitHub</a>",
-    "crash_page_report_issue": "If none of the above helped, please <a href=\"`x`\">open a new issue on GitHub</a> (preferably in English) and include the following text in your message (do NOT translate that text):"
+    "crash_page_report_issue": "If none of the above helped, please <a href=\"`x`\">open a new issue on GitHub</a> (preferably in English) and include the following text in your message (do NOT translate that text):",
+    "error_video_not_in_playlist": "The requested video doesn't exist in this playlist. <a href=\"`x`\">Click here for the playlist home page.</a>"
 }
diff --git a/src/invidious/routes/embed.cr b/src/invidious/routes/embed.cr
index 84da9993c..e64865877 100644
--- a/src/invidious/routes/embed.cr
+++ b/src/invidious/routes/embed.cr
@@ -2,11 +2,16 @@
 
 module Invidious::Routes::Embed
   def self.redirect(env)
+    locale = env.get("preferences").as(Preferences).locale
     if plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
       begin
         playlist = get_playlist(plid)
         offset = env.params.query["index"]?.try &.to_i? || 0
         videos = get_playlist_videos(playlist, offset: offset)
+        if videos.empty?
+          url = "/playlist?list=#{plid}"
+          raise NotFoundException.new(translate(locale, "error_video_not_in_playlist", url))
+        end
       rescue ex : NotFoundException
         return error_template(404, ex)
       rescue ex
@@ -26,6 +31,7 @@ module Invidious::Routes::Embed
   end
 
   def self.show(env)
+    locale = env.get("preferences").as(Preferences).locale
     id = env.params.url["id"]
 
     plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
@@ -62,6 +68,10 @@ module Invidious::Routes::Embed
           playlist = get_playlist(plid)
           offset = env.params.query["index"]?.try &.to_i? || 0
           videos = get_playlist_videos(playlist, offset: offset)
+          if videos.empty?
+            url = "/playlist?list=#{plid}"
+            raise NotFoundException.new(translate(locale, "error_video_not_in_playlist", url))
+          end
         rescue ex : NotFoundException
           return error_template(404, ex)
         rescue ex