diff --git a/api/handler/rpc/rpc.go b/api/handler/rpc/rpc.go
index c6bd6daf..d7c3c75c 100644
--- a/api/handler/rpc/rpc.go
+++ b/api/handler/rpc/rpc.go
@@ -289,8 +289,8 @@ func requestPayload(r *http.Request) ([]byte, error) {
 	for k, v := range md {
 		if strings.HasPrefix(k, "x-api-field-") {
 			matches[strings.TrimPrefix(k, "x-api-field-")] = v
+			delete(md, k)
 		}
-		delete(md, k)
 	}
 
 	// restore context without fields