diff --git a/src/Bundle/ChillMainBundle/Repository/AuditTrailRepository.php b/src/Bundle/ChillMainBundle/Repository/AuditTrailRepository.php
index 385a0dd55..e9030da31 100644
--- a/src/Bundle/ChillMainBundle/Repository/AuditTrailRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/AuditTrailRepository.php
@@ -48,15 +48,11 @@ class AuditTrailRepository extends ServiceEntityRepository
             ->setParameter('id', $auditTrail->getId())
             ->setParameter('action', $auditTrail->getAction())
             ->setParameter('occured_at', $auditTrail->getOccurredAt(), Types::DATETIMETZ_IMMUTABLE)
-            ->setParameter('user_id', null)
+            ->setParameter('user_id', $auditTrail->getUser()?->getId(), Types::INTEGER)
             ->setParameter('description', $auditTrail->getDescription())
             ->setParameter('targets', $auditTrail->getTargets(), Types::JSON)
             ->setParameter('metadata', $auditTrail->getMetadata(), Types::JSON);
 
-        if (null !== $user = $auditTrail->getUser()) {
-            $sql->setParameter('user_id', $user->getId());
-        }
-
         $sql->executeQuery();
     }
 }