diff --git a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/UnsupportedSigningAlgorithmIntegration.kt b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/UnsupportedSigningAlgorithmIntegration.kt
index 2513b626e2a..96352dc680f 100644
--- a/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/UnsupportedSigningAlgorithmIntegration.kt
+++ b/codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/UnsupportedSigningAlgorithmIntegration.kt
@@ -5,30 +5,35 @@
 package aws.sdk.kotlin.codegen.customization.s3
 
 import aws.sdk.kotlin.codegen.AwsRuntimeTypes
+import software.amazon.smithy.aws.traits.auth.SigV4ATrait
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
 import software.amazon.smithy.kotlin.codegen.core.KotlinWriter
 import software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolGenerator
 import software.amazon.smithy.kotlin.codegen.rendering.protocol.ProtocolMiddleware
 import software.amazon.smithy.model.Model
+import software.amazon.smithy.model.knowledge.ServiceIndex
 import software.amazon.smithy.model.shapes.OperationShape
 
 // FIXME: Remove this once sigV4a is supported by default AWS signer
 /**
- * Registers an interceptor for S3 to deal with the default signer not supporting sigV4a
+ * Registers an interceptor for sigV4a services to deal with the default signer not supporting sigV4a
  * See: [aws.sdk.kotlin.runtime.http.interceptors.UnsupportedSigningAlgorithmInterceptor]
  */
 class UnsupportedSigningAlgorithmIntegration : KotlinIntegration {
-    override fun enabledForService(model: Model, settings: KotlinSettings): Boolean =
-        when (settings.sdkId.lowercase()) {
-            "s3", "eventbridge", "cloudfront keyvaluestore" -> true
-            else -> false
-        }
+
+    // Needs to happen after the SigV4AsymmetricTraitCustomization (-60), which adds the sigV4a trait to models missing it
+    override val order: Byte = -50
+
+    // Set to true rather than looking for sigV4a in the model because this integration would be filtered out
+    // before the application of the trait via SigV4AsymmetricTraitCustomization.
+    // See: CodegenVisitor
+    override fun enabledForService(model: Model, settings: KotlinSettings): Boolean = true
 
     override fun customizeMiddleware(
         ctx: ProtocolGenerator.GenerationContext,
         resolved: List<ProtocolMiddleware>,
-    ): List<ProtocolMiddleware> = resolved + UnsupportedSigningAlgorithmMiddleware
+    ): List<ProtocolMiddleware> = if (modelHasSigV4aTrait(ctx)) resolved + UnsupportedSigningAlgorithmMiddleware else resolved
 }
 
 private val UnsupportedSigningAlgorithmMiddleware = object : ProtocolMiddleware {
@@ -41,3 +46,10 @@ private val UnsupportedSigningAlgorithmMiddleware = object : ProtocolMiddleware
         )
     }
 }
+
+private fun modelHasSigV4aTrait(ctx: ProtocolGenerator.GenerationContext): Boolean =
+    ServiceIndex
+        .of(ctx.model)
+        .getAuthSchemes(ctx.service)
+        .values
+        .any { it.javaClass == SigV4ATrait::class.java }