diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java index fdfa771dbc20..b04c37c6bf00 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java @@ -33,6 +33,10 @@ public class MergeCustomQueryParamsStage implements MutableRequestToRequestPipel @Override public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, RequestExecutionContext context) throws Exception { + if (context.requestConfig().rawQueryParameters().isEmpty()) { + return request; + } + return request.rawQueryParameters(mergeParams(request, context)); }