diff --git a/builder/builder-next/builder.go b/builder/builder-next/builder.go
index 1d8840d4c6..bb701106f6 100644
--- a/builder/builder-next/builder.go
+++ b/builder/builder-next/builder.go
@@ -90,6 +90,10 @@ type Builder struct {
 func New(opt Opt) (*Builder, error) {
 	reqHandler := newReqBodyHandler(tracing.DefaultTransport)
 
+	if opt.IdentityMapping != nil && opt.IdentityMapping.Empty() {
+		opt.IdentityMapping = nil
+	}
+
 	c, err := newController(reqHandler, opt)
 	if err != nil {
 		return nil, err