diff --git a/logs/logs.go b/logs/logs.go
index 89cb0f8dba7853c0cb0c8b104cfdbb51d49cbf94..99aa65e5f6179e2d8643a9b6797d3ac9a7d515c2 100644
--- a/logs/logs.go
+++ b/logs/logs.go
@@ -219,11 +219,14 @@ func LogShipmentID(id int64) {
 	}, "Current-shipment-ID")
 }
 
-func LogRequestInfo(req events.APIGatewayProxyRequest, extraFields ...map[string]interface{}) {
+func LogRequestInfo(req events.APIGatewayProxyRequest, shouldExcludeBody bool, extraFields map[string]interface{}) {
 	fields := map[string]interface{}{
 		"path":   req.Path,
 		"method": req.HTTPMethod,
-		"body":   req.Body,
+	}
+
+	if !shouldExcludeBody {
+		fields["body"] = req.Body
 	}
 
 	if req.QueryStringParameters != nil {
@@ -234,11 +237,9 @@ func LogRequestInfo(req events.APIGatewayProxyRequest, extraFields ...map[string
 		fields["client_version"] = req.Headers["client-version"]
 	}
 
-	if extraFields != nil {
-		for i := range extraFields {
-			for k, v := range extraFields[i] {
-				fields[k] = v
-			}
+	for k, v := range extraFields {
+		if k != "" {
+			fields[k] = v
 		}
 	}