diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md
index 7f9b8939ff..8cc494b9a0 100644
--- a/CHANGELOG.next.md
+++ b/CHANGELOG.next.md
@@ -66,6 +66,10 @@ Thanks, you're awesome :-) -->
 
 * Support ES 6.x type fallback for `match_only_text` field types. #1528
 
+#### Bugfixes
+
+* Prevent failure if no files need to be deleted `find | xargs rm`. #1588
+
 <!-- All empty sections:
 
 ## Unreleased
diff --git a/Makefile b/Makefile
index 5d31192597..f0cd237d8a 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ generator: ve
 # Generate Go code from the schema.
 .PHONY: gocodegen
 gocodegen:
-	find code/go/ecs -name '*.go' -not -name 'doc.go' | xargs rm
+	find code/go/ecs -name '*.go' -not -name 'doc.go' -delete
 	cd scripts \
 	  && $(FORCE_GO_MODULES) go run cmd/gocodegen/gocodegen.go \
 	        -version=$(VERSION) \