diff --git a/application/Espo/Core/ORM/Repositories/RDB.php b/application/Espo/Core/ORM/Repositories/RDB.php
index 29f5e3c087..bf323ee574 100644
--- a/application/Espo/Core/ORM/Repositories/RDB.php
+++ b/application/Espo/Core/ORM/Repositories/RDB.php
@@ -175,7 +175,9 @@ class RDB extends \Espo\ORM\Repositories\RDB implements Injectable
             $entity->set('modifiedAt', $nowString);
         }
         if ($entity->hasAttribute('modifiedById')) {
-            $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
+            if ($this->getEntityManager()->getUser()) {
+                $entity->set('modifiedById', $this->getEntityManager()->getUser()->id);
+            }
         }
     }