diff --git a/application/Espo/Repositories/UniqueId.php b/application/Espo/Repositories/UniqueId.php
index 46db82d51f..4eccf8321c 100644
--- a/application/Espo/Repositories/UniqueId.php
+++ b/application/Espo/Repositories/UniqueId.php
@@ -44,7 +44,7 @@ class UniqueId extends \Espo\Core\ORM\Repositories\RDB
     protected function getNewEntity()
     {
         $entity = parent::getNewEntity();
-        $entity->set('name', uniqid());
+        $entity->set('name', \Espo\Core\Utils\Util::generateId());
         return $entity;
     }
 }