diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java
index 3c2c3d1ca5a4..aadb528ea97a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java
@@ -536,11 +536,6 @@ private MethodSpec authSchemeWithEndpointSignerPropertiesMethod() {
 
         method.beginControlFlow("for ($T endpointAuthScheme : endpointAuthSchemes)", EndpointAuthScheme.class);
 
-        // Don't include signer properties for auth options that don't match our selected auth scheme
-        method.beginControlFlow("if (!endpointAuthScheme.schemeId().equals(selectedAuthScheme.authSchemeOption().schemeId()))");
-        method.addStatement("continue");
-        method.endControlFlow();
-
         method.addStatement("$T option = selectedAuthScheme.authSchemeOption().toBuilder()", AuthSchemeOption.Builder.class);
 
         if (dependsOnHttpAuthAws) {
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java
index 4d2a407cf416..2720cd404eb3 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java
@@ -125,9 +125,6 @@ private static void operationWithStaticContextParamsStaticContextParams(QueryEnd
     private <T extends Identity> SelectedAuthScheme<T> authSchemeWithEndpointSignerProperties(
         List<EndpointAuthScheme> endpointAuthSchemes, SelectedAuthScheme<T> selectedAuthScheme) {
         for (EndpointAuthScheme endpointAuthScheme : endpointAuthSchemes) {
-            if (!endpointAuthScheme.schemeId().equals(selectedAuthScheme.authSchemeOption().schemeId())) {
-                continue;
-            }
             AuthSchemeOption.Builder option = selectedAuthScheme.authSchemeOption().toBuilder();
             if (endpointAuthScheme instanceof SigV4AuthScheme) {
                 SigV4AuthScheme v4AuthScheme = (SigV4AuthScheme) endpointAuthScheme;
diff --git a/services/s3control/src/main/resources/codegen-resources/customization.config b/services/s3control/src/main/resources/codegen-resources/customization.config
index 49d810b2a40e..2e66096fb5f1 100644
--- a/services/s3control/src/main/resources/codegen-resources/customization.config
+++ b/services/s3control/src/main/resources/codegen-resources/customization.config
@@ -19,6 +19,5 @@
     "interceptors": [
         "software.amazon.awssdk.services.s3control.internal.interceptors.ConfigureSignerInterceptor",
         "software.amazon.awssdk.services.s3control.internal.interceptors.PayloadSigningInterceptor"
-    ],
-      "useSraAuth": true
+    ]
 }
\ No newline at end of file