diff --git a/server/fishtest/schemas.py b/server/fishtest/schemas.py
index 13bab4a19..e3f175c4e 100644
--- a/server/fishtest/schemas.py
+++ b/server/fishtest/schemas.py
@@ -37,7 +37,7 @@
     url,
 )
 
-run_id = regex(r"[a-f0-9]{24}", name="run_id")
+run_id = intersect(str, set_name(ObjectId.is_valid, "valid_object_id"))
 run_id_pgns = regex(r"[a-f0-9]{24}-(0|[1-9]\d*)", name="run_id_pgns")
 run_name = intersect(regex(r".*-[a-f0-9]{7}", name="run_name"), size(0, 23 + 1 + 7))
 action_message = intersect(str, size(0, 1024))