diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 277a18142..9f2196982 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -14,11 +14,11 @@ namespace Chill\MainBundle\Controller;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
 use Chill\MainBundle\Form\WorkflowSignatureMetadataType;
 use Chill\MainBundle\Form\WorkflowStepType;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowStepSignatureRepository;
 use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
 use Chill\MainBundle\Security\ChillSecurity;
 use Chill\MainBundle\Workflow\EntityWorkflowManager;
@@ -32,6 +32,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Workflow\Registry;
@@ -51,6 +52,7 @@ class WorkflowController extends AbstractController
         private readonly ChillSecurity $security,
         private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
         private readonly ClockInterface $clock,
+        private readonly EntityWorkflowStepSignatureRepository $entityWorkflowStepSignatureRepository,
     ) {}
 
     #[Route(path: '/{_locale}/main/workflow/create', name: 'chill_main_workflow_create')]
@@ -374,7 +376,11 @@ class WorkflowController extends AbstractController
     #[Route(path: '/{_locale}/main/workflow/signature/{signature_id}/metadata', name: 'chill_main_workflow_signature_metadata')]
     public function addSignatureMetadata(int $signature_id, Request $request): Response
     {
-        $signature = $this->entityManager->getRepository(EntityWorkflowStepSignature::class)->find($signature_id);
+        $signature = $this->entityWorkflowStepSignatureRepository->find($signature_id);
+
+        if (null === $signature) {
+            throw new NotFoundHttpException('signature not found');
+        }
 
         if ($signature->getSigner() instanceof User) {
             return $this->redirectToRoute('chill_main_workflow_signature_add', ['id' => $signature_id]);
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
index f613b69dd..ddccc6a4c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_signature.html.twig
@@ -6,12 +6,16 @@
             <div class="col-sm-12 col-md-8"><span>{{ s.signer|chill_entity_render_box }}</span></div>
             <div class="col-sm-12 col-md-4">
                 <ul class="record_actions">
-                    <li>
-                        <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_workflow_signature_metadata', { 'signature_id': s.id}) }}"><i class="fa fa-pencil-square-o"></i> {{ 'workflow.signature_zone.button_sign'|trans }}</a>
-                        {% if s.state is same as('signed') %}
-                            <p class="updatedBy">{{ s.stateDate }}</p>
-                        {% endif %}
-                    </li>
+                    {% if s.state.value == 'signed' %}
+                        <p>{{ 'workflow.signature_zone.has_signed_statement'|trans( { '%datetime%' : s.stateDate|date('j M Y à H:i:s') } ) }}</p>
+                    {% else %}
+                        <li>
+                            <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_workflow_signature_metadata', { 'signature_id': s.id}) }}"><i class="fa fa-pencil-square-o"></i> {{ 'workflow.signature_zone.button_sign'|trans }}</a>
+                            {% if s.state is same as('signed') %}
+                                <p class="updatedBy">{{ s.stateDate }}</p>
+                            {% endif %}
+                        </li>
+                    {% endif %}
                 </ul>
             </div>
         {% endfor %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 9a90b7fa1..23a77c710 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -531,6 +531,7 @@ workflow:
     signature_zone:
         title: Appliquer les signatures électroniques
         button_sign: Signer
+        has_signed_statement: 'À signé le %datetime%'
         metadata:
             sign_by: 'Signature pour %name%'
             docType: Type de document