diff --git a/src/Bundle/ChillMainBundle/Audit/SubjectConverterManager.php b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManager.php
index d43196889..00c2d67c1 100644
--- a/src/Bundle/ChillMainBundle/Audit/SubjectConverterManager.php
+++ b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManager.php
@@ -28,16 +28,25 @@ final readonly class SubjectConverterManager implements SubjectConverterManagerI
      * @throws ConvertSubjectException
      */
     public function convertEntityToSubjects(mixed $subject): array
+    {
+        $subjects = $this->getSubjectsForEntity($subject);
+
+        if ($subjects instanceof Subject) {
+            return [$subjects->asArray()];
+        }
+
+        return array_map(static fn (Subject $subject) => $subject->asArray(), $subjects);
+    }
+
+    public function getSubjectsForEntity(mixed $subject): Subject|array
     {
         foreach ($this->converters as $converter) {
+            if ($converter instanceof SubjectConverterManagerAwareInterface) {
+                $converter->setSubjectConverterManager($this);
+            }
+
             if ($converter->supportsConvert($subject)) {
-                $subjects = $converter->convert($subject);
-
-                if ($subjects instanceof Subject) {
-                    return [$subjects->asArray()];
-                }
-
-                return array_map(static fn (Subject $subject) => $subject->asArray(), $subjects);
+                return $converter->convert($subject);
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerAwareInterface.php b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerAwareInterface.php
new file mode 100644
index 000000000..767cbedac
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerAwareInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Audit;
+
+interface SubjectConverterManagerAwareInterface
+{
+    public function setSubjectConverterManager(SubjectConverterManagerInterface $subjectConverterManager): void;
+}
diff --git a/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerAwareTrait.php b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerAwareTrait.php
new file mode 100644
index 000000000..c6462e083
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerAwareTrait.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Audit;
+
+trait SubjectConverterManagerAwareTrait
+{
+    private SubjectConverterManagerInterface $subjectConverterManager;
+
+    public function setSubjectConverterManager(SubjectConverterManagerInterface $subjectConverterManager): void
+    {
+        $this->subjectConverterManager = $subjectConverterManager;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerInterface.php b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerInterface.php
index c955648f3..5c4a84f71 100644
--- a/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerInterface.php
+++ b/src/Bundle/ChillMainBundle/Audit/SubjectConverterManagerInterface.php
@@ -17,4 +17,9 @@ interface SubjectConverterManagerInterface
      * @return list<array>
      */
     public function convertEntityToSubjects(mixed $subject): array;
+
+    /**
+     * @return Subject|list<Subject>
+     */
+    public function getSubjectsForEntity(mixed $subject): Subject|array;
 }
diff --git a/src/Bundle/ChillMainBundle/config/services/audit.yaml b/src/Bundle/ChillMainBundle/config/services/audit.yaml
index 51ac98369..173bfe7e4 100644
--- a/src/Bundle/ChillMainBundle/config/services/audit.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/audit.yaml
@@ -8,6 +8,8 @@ services:
         exclude:
             - '../../Audit/Subject.php'
             - '../../Audit/AuditEvent.php'
+            - '../../Audit/SubjectConverterManagerAwareInterface.php'
+            - '../../Audit/SubjectConverterManagerAwareTrait.php'
             - '../../Audit/Exception/'
             - '../../Audit/Exception/*'