diff --git a/services/capability/capability/views/capability.py b/services/capability/capability/views/capability.py
index bbdd703bbd8c84e1923e47ea3c2bf66eab05477e..a38f0e9b45a15975926ff11a657b6b58c89b4604 100644
--- a/services/capability/capability/views/capability.py
+++ b/services/capability/capability/views/capability.py
@@ -296,7 +296,9 @@ def get_casa_version(request: Request) -> Response:
         or a 404 response (HTTPNotFound) if one isn't returned
     """
     casa_version = request.casa_matrix_service.get_version(
-        request.params["version"], request.params["capability"], request.params["telescope"]
+        request.params["version"] if "version" in request.params else None,
+        request.params["capability"] if "capability" in request.params else None,
+        request.params["telescope"] if "telescope" in request.params else None,
     )
 
     if casa_version:
@@ -314,7 +316,9 @@ def get_casa_versions(request: Request) -> Response:
     :return: Response containing a list of CASA versions and their paths
         or a 404 response (HTTPNotFound) if none are returned
     """
-    casa_versions = request.casa_matrix_service.get_versions(request.params["capability"])
+    casa_versions = request.casa_matrix_service.get_versions(
+        request.params["capability"] if "capability" in request.params else None
+    )
 
     if casa_versions:
         return Response(status_int=http.HTTPStatus.OK, json_body={"resp": f"{casa_versions}"})
@@ -351,7 +355,7 @@ def add_casa_version(request: Request) -> Response:
     added = request.casa_matrix_service.add_version(
         request.params["version"],
         request.params["capabilities"],
-        request.params["is_cluster_compatible"],
+        request.params["is_cluster_compatible"] if "is_cluster_compatible" in request.params else None,
     )
 
     if added:
@@ -372,7 +376,7 @@ def update_casa_version(request: Request) -> Response:
     updated = request.casa_matrix_service.update_version(
         request.params["version"],
         request.params["capabilities"],
-        request.params["is_cluster_compatible"],
+        request.params["is_cluster_compatible"] if "is_cluster_compatible" in request.params else None,
     )
 
     if updated: