diff --git a/api/justfile b/api/justfile
index b9c97931f09..14e8948c131 100644
--- a/api/justfile
+++ b/api/justfile
@@ -157,7 +157,7 @@ generate-docs doc="media-props" fail_on_diff="true":
 
 # Run API tests inside the Docker container
 [positional-arguments]
-test *args: wait-up
+test *args:
     env DC_USER="ov_user" just ../exec web pytest "$@"
 
 # Run API tests locally
diff --git a/api/test/integration/test_media_integration.py b/api/test/integration/test_media_integration.py
index 08646a11e45..56d0cec04ae 100644
--- a/api/test/integration/test_media_integration.py
+++ b/api/test/integration/test_media_integration.py
@@ -304,6 +304,7 @@ def test_search_refuses_invalid_categories(
 @pytest.mark.parametrize(
     "bad_uuid",
     [
+        "000000000000000000000000000000000000",
         "123456789123456789123456789123456789",
         "12345678-1234-5678-1234-1234567891234",
         "abcd",
@@ -383,6 +384,22 @@ def test_detail_view_contains_sensitivity_info(sensitive_result, api_client):
 ################
 
 
+@pytest.mark.parametrize(
+    "bad_uuid",
+    [
+        "000000000000000000000000000000000000",
+        "123456789123456789123456789123456789",
+        "12345678-1234-5678-1234-1234567891234",
+        "abcd",
+    ],
+)
+def test_related_view_for_invalid_uuids_returns_not_found(
+    media_type_config: MediaTypeConfig, bad_uuid: str, api_client
+):
+    res = api_client.get(f"/v1/{media_type_config.url_prefix}/{bad_uuid}/related/")
+    assert res.status_code == 404
+
+
 def test_related_view_has_no_pagination(related_results):
     _, _, data = related_results
     results = data["results"]