diff --git a/pkg/cookiebanner/client.go b/pkg/cookiebanner/client.go
index 6ea0541a8..33ddfd619 100644
--- a/pkg/cookiebanner/client.go
+++ b/pkg/cookiebanner/client.go
@@ -127,6 +127,7 @@ func (r *UpdateCookieCategoryRequest) Validate() error {
 	v.Check(r.CookieCategoryID, "cookie_category_id", validator.Required(), validator.GID(coredata.CookieCategoryEntityType))
 	v.Check(r.Name, "name", validator.SafeTextNoNewLine(255))
 	v.Check(r.Description, "description", validator.SafeText(1000))
+	v.Check(r.Rank, "rank", validator.Min(0))
 
 	return v.Error()
 }
diff --git a/pkg/coredata/cookie_banner.go b/pkg/coredata/cookie_banner.go
index 7652e8a22..614c5c398 100644
--- a/pkg/coredata/cookie_banner.go
+++ b/pkg/coredata/cookie_banner.go
@@ -338,11 +338,15 @@ WHERE
 	}
 	maps.Copy(args, scope.SQLArguments())
 
-	_, err := tx.Exec(ctx, q, args)
+	result, err := tx.Exec(ctx, q, args)
 	if err != nil {
 		return fmt.Errorf("cannot update cookie banner: %w", err)
 	}
 
+	if result.RowsAffected() == 0 {
+		return ErrResourceNotFound
+	}
+
 	return nil
 }