diff --git a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
index bf493c344..26a302b13 100644
--- a/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
@@ -41,12 +41,12 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
     {
         $object = $args->getObject();
 
-        if (
-            $object instanceof TrackCreationInterface
-            && $this->security->getUser() instanceof User
-        ) {
-            $object->setCreatedBy($this->security->getUser());
+        if ($object instanceof TrackCreationInterface) {
             $object->setCreatedAt(new DateTimeImmutable('now'));
+
+            if ($this->security->getUser() instanceof User) {
+                $object->setCreatedBy($this->security->getUser());
+            }
         }
 
         $this->onUpdate($object);
@@ -61,12 +61,12 @@ class TrackCreateUpdateSubscriber implements EventSubscriber
 
     protected function onUpdate(object $object): void
     {
-        if (
-            $object instanceof TrackUpdateInterface
-            && $this->security->getUser() instanceof User
-        ) {
-            $object->setUpdatedBy($this->security->getUser());
-            $object->setUpdatedAt(new DateTimeImmutable('now'));
+        if ($object instanceof TrackUpdateInterface) {
+           $object->setUpdatedAt(new DateTimeImmutable('now'));
+
+           if ($this->security->getUser() instanceof User) {
+               $object->setUpdatedBy($this->security->getUser());
+           }
         }
     }
 }