diff --git a/cypress/integration/console/devices/unclaim.spec.js b/cypress/integration/console/devices/unclaim.spec.js
index de4efa79b1..c93af57cc4 100644
--- a/cypress/integration/console/devices/unclaim.spec.js
+++ b/cypress/integration/console/devices/unclaim.spec.js
@@ -86,6 +86,8 @@ describe('Device un-claiming', () => {
         cy.findByRole('button', { name: /Unclaim and delete end device/ }).click()
       })
 
+    cy.wait('@unclaim-request').its('request.body').should('not.exist')
+
     cy.findByTestId('error-notification').should('not.exist')
 
     cy.location('pathname').should(
diff --git a/tools/mage/proto.go b/tools/mage/proto.go
index e994e4a6c5..fedf13d8f5 100644
--- a/tools/mage/proto.go
+++ b/tools/mage/proto.go
@@ -152,7 +152,6 @@ func (p Proto) fieldMask(context.Context) error {
 func (p Proto) grpcGateway(context.Context) error {
 	return withProtoc(grpcGatewayProtoImage, func(pCtx *protocContext, protoc func(...string) error) error {
 		if err := protoc(
-			fmt.Sprintf("--grpc-gateway_out=allow_delete_body=true:%s", protocOut),
 			fmt.Sprintf("%s/api/*.proto", pCtx.WorkingDirectory),
 		); err != nil {
 			return fmt.Errorf("failed to generate protos: %w", err)
@@ -204,7 +203,6 @@ func (p Proto) Swagger(context.Context) error {
 	}
 	return withProtoc(openAPIv2ProtoImage, func(pCtx *protocContext, protoc func(...string) error) error {
 		if err := protoc(
-			"--openapiv2_opt allow_delete_body=true",
 			"--openapiv2_opt=json_names_for_fields=false",
 			fmt.Sprintf("--openapiv2_out=allow_merge,merge_file_name=api:%s/api", pCtx.WorkingDirectory),
 			fmt.Sprintf("%s/api/*.proto", pCtx.WorkingDirectory),