diff --git a/src/symfony/src/DependencyInjection/Factory/Security/WebauthnServicesFactory.php b/src/symfony/src/DependencyInjection/Factory/Security/WebauthnServicesFactory.php
index 4cb017d3a..c429f0b13 100644
--- a/src/symfony/src/DependencyInjection/Factory/Security/WebauthnServicesFactory.php
+++ b/src/symfony/src/DependencyInjection/Factory/Security/WebauthnServicesFactory.php
@@ -10,6 +10,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Webauthn\AuthenticatorAssertionResponseValidator;
 use Webauthn\AuthenticatorAttestationResponseValidator;
+use Webauthn\Bundle\DependencyInjection\Compiler\EventDispatcherSetterCompilerPass;
 use Webauthn\CeremonyStep\CeremonyStepManager;
 use Webauthn\CeremonyStep\CeremonyStepManagerFactory;
 
@@ -56,7 +57,8 @@ public function createAuthenticatorAssertionResponseValidator(
                 $authenticatorAssertionResponseValidatorId,
                 new Definition(AuthenticatorAssertionResponseValidator::class)
             )
-            ->setArguments([null, null, null, null, null, new Reference($ceremonyStepManagerId)]);
+            ->setArguments([null, null, null, null, null, new Reference($ceremonyStepManagerId)])
+            ->addTag(EventDispatcherSetterCompilerPass::TAG);
 
         return $authenticatorAssertionResponseValidatorId;
     }
@@ -82,7 +84,8 @@ public function createAuthenticatorAttestationResponseValidator(
                 $authenticatorAttestationResponseValidatorId,
                 new Definition(AuthenticatorAttestationResponseValidator::class)
             )
-            ->setArguments([null, null, null, null, null, new Reference($ceremonyStepManagerId)]);
+            ->setArguments([null, null, null, null, null, new Reference($ceremonyStepManagerId)])
+            ->addTag(EventDispatcherSetterCompilerPass::TAG);
 
         return $authenticatorAttestationResponseValidatorId;
     }
diff --git a/src/symfony/src/DependencyInjection/WebauthnExtension.php b/src/symfony/src/DependencyInjection/WebauthnExtension.php
index 4dc1b7c95..67cfda836 100644
--- a/src/symfony/src/DependencyInjection/WebauthnExtension.php
+++ b/src/symfony/src/DependencyInjection/WebauthnExtension.php
@@ -244,6 +244,7 @@ private function loadCreationControllersSupport(ContainerBuilder $container, arr
                 null,
                 new Reference($creationCeremonyStepManagerId),
             ]);
+            $attestationResponseValidator->addTag(EventDispatcherSetterCompilerPass::TAG);
             $container->setDefinition($attestationResponseValidatorId, $attestationResponseValidator);
 
             $attestationResponseControllerId = sprintf('webauthn.controller.creation.response.%s', $name);
@@ -330,6 +331,7 @@ private function loadRequestControllersSupport(ContainerBuilder $container, arra
                 null,
                 new Reference($requestCeremonyStepManagerId),
             ]);
+            $assertionResponseValidator->addTag(EventDispatcherSetterCompilerPass::TAG);
             $container->setDefinition($assertionResponseValidatorId, $assertionResponseValidator);
 
             $assertionResponseControllerId = sprintf('webauthn.controller.request.response.%s', $name);