diff --git a/services/capability/capability/views/casa_matrix.py b/services/capability/capability/views/casa_matrix.py
index 91b3ad4c74731f8749fa6fa80066f3ecf9b96720..8c0090ba40f1af763ff83e0304c2859719907a13 100644
--- a/services/capability/capability/views/casa_matrix.py
+++ b/services/capability/capability/views/casa_matrix.py
@@ -72,9 +72,13 @@ def get_casa_versions(request: Request) -> Response:
         or a 404 response (HTTPNotFound) if none are returned
     """
     body = parse_body(request)
+
+    if "capability" not in body:
+        return HTTPBadRequest(detail=f"Capability not given")
+
     params = {
         "version": body["version"] if "version" in body else None,
-        "capability": body["capability"] if "capability" in body else None,
+        "capability": body["capability"],
         "telescope": body["telescope"] if "telescope" in body else None,
     }
     params = {k: v for k, v in params.items() if v is not None}