diff --git a/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php b/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php
index a89e9ffda..e32495160 100644
--- a/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php
+++ b/src/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPass.php
@@ -48,6 +48,7 @@ public function process(ContainerBuilder $container): void
 
         if (!$resolveTargetEntityListener->hasTag('doctrine.event_listener')) {
             $resolveTargetEntityListener->addTag('doctrine.event_listener', ['event' => 'loadClassMetadata']);
+            $resolveTargetEntityListener->addTag('doctrine.event_listener', ['event' => 'onClassMetadataNotFound']);
         }
     }
 }
diff --git a/tests/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPassTest.php b/tests/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPassTest.php
index 159e266b1..e5bb4237a 100644
--- a/tests/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPassTest.php
+++ b/tests/Bundle/DependencyInjection/Compiler/DoctrineTargetEntitiesResolverPassTest.php
@@ -57,6 +57,12 @@ public function it_adds_doctrine_event_listener_tag_to_target_entities_resolver_
             'doctrine.event_listener',
             ['event' => 'loadClassMetadata'],
         );
+
+        $this->assertContainerBuilderHasServiceDefinitionWithTag(
+            'doctrine.orm.listeners.resolve_target_entity',
+            'doctrine.event_listener',
+            ['event' => 'onClassMetadataNotFound'],
+        );
     }
 
     protected function registerCompilerPass(ContainerBuilder $container): void