diff --git a/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go b/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go
index afc2fd35a66fa6f55e34d463a770968524bd9f5b..11ce04b9c50305566bdc5d8d76d3292021cd252f 100644
--- a/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go
+++ b/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go
@@ -909,16 +909,16 @@ func servicesGET(w http.ResponseWriter, r *http.Request) {
 	// Validate query parameters
 	u, _ := url.Parse(r.URL.String())
 	q := u.Query()
-	validParams := []string{"api-invoker-id"}
-	err := validateQueryParams(q, validParams)
-	if err != nil {
-		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)
-		return
-	}
 
 	// Extract and parse query parameters
 	api_invoker_id := q.Get("api-invoker-id")
 	if api_invoker_id != "" {
+		validParams := []string{"api-invoker-id"}
+		err := validateQueryParams(q, validParams)
+		if err != nil {
+			errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)
+			return
+		}
 		getServices(w, r, api_invoker_id)
 	} else {
 		getServices(w, r, "")