diff --git a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
index b531857c1422c..449da294dfb5e 100644
--- a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
+++ b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
@@ -73,7 +73,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
         }
 
         if (null === $object && !$argument->isNullable()) {
-            throw new NotFoundHttpException(sprintf('"%s" object not found by "%s".', $options->class, self::class).$message);
+            throw new NotFoundHttpException($options->message ?? (sprintf('"%s" object not found by "%s".', $options->class, self::class).$message));
         }
 
         return [$object];
diff --git a/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php b/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php
index 529bf05dc7767..7f0c1fa335069 100644
--- a/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php
+++ b/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php
@@ -31,6 +31,7 @@ public function __construct(
         public ?bool $evictCache = null,
         bool $disabled = false,
         string $resolver = EntityValueResolver::class,
+        public ?string $message = null,
     ) {
         parent::__construct($resolver, $disabled);
     }
@@ -46,6 +47,7 @@ public function withDefaults(self $defaults, ?string $class): static
         $clone->stripNull ??= $defaults->stripNull ?? false;
         $clone->id ??= $defaults->id;
         $clone->evictCache ??= $defaults->evictCache ?? false;
+        $clone->message ??= $defaults->message;
 
         return $clone;
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php b/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
index 883af01280532..ef62a15f12c09 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -153,7 +153,7 @@ public function testResolveWithConversionFailedException()
         $request = new Request();
         $request->attributes->set('id', 'test');
 
-        $argument = $this->createArgument('stdClass', new MapEntity(id: 'id'));
+        $argument = $this->createArgument('stdClass', new MapEntity(id: 'id', message: 'Test'));
 
         $repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
         $repository->expects($this->once())
@@ -167,6 +167,7 @@ public function testResolveWithConversionFailedException()
             ->willReturn($repository);
 
         $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('Test');
 
         $resolver->resolve($request, $argument);
     }