diff --git a/src/invidious/routes/api/v1/authenticated.cr b/src/invidious/routes/api/v1/authenticated.cr
index 75dad6df..e8e7c524 100644
--- a/src/invidious/routes/api/v1/authenticated.cr
+++ b/src/invidious/routes/api/v1/authenticated.cr
@@ -82,7 +82,7 @@ module Invidious::Routes::API::V1::Authenticated
     end
 
     id = env.params.url["id"]?.try &.as(String)
-    if !id
+    if !id.match(/[a-zA-Z0-9_-]{11}/)
       return error_json(400, "Invalid video id.")
     end
 
@@ -93,6 +93,10 @@ module Invidious::Routes::API::V1::Authenticated
   def self.mark_unwatched(env)
     user = env.get("user").as(User)
 
+    if !user.preferences.watch_history
+      return error_json(409, "Watch history is disabled in preferences.")
+    end
+
     id = env.params.url["id"]?.try &.as(String)
     if !id.match(/[a-zA-Z0-9_-]{11}/)
       return error_json(400, "Invalid video id.")