From 9096e074b2a6570f1b56c7d162212eff8feb15bb Mon Sep 17 00:00:00 2001
From: Zoe Wang <33073555+zoewangg@users.noreply.github.com>
Date: Fri, 4 Jul 2025 15:23:21 -0700
Subject: [PATCH] Avoid merging raw query params if there is no custom raw
 query params

---
 .../http/pipeline/stages/MergeCustomQueryParamsStage.java     | 4 ++++
 1 file changed, 4 insertions(+)

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));
     }