diff --git a/application/Espo/Core/Entities/Person.php b/application/Espo/Core/Entities/Person.php
index 102a775ebe..c560bb5fbb 100644
--- a/application/Espo/Core/Entities/Person.php
+++ b/application/Espo/Core/Entities/Person.php
@@ -50,8 +50,8 @@ class Person extends Entity
         string $entityType,
         array $defs,
         EntityManager $entityManager,
-        ValueAccessorFactory $valueAccessorFactory,
-        Helper $helper
+        Helper $helper,
+        ?ValueAccessorFactory $valueAccessorFactory = null
     ) {
         parent::__construct($entityType, $defs, $entityManager, $valueAccessorFactory);
 
diff --git a/application/Espo/ORM/BaseEntity.php b/application/Espo/ORM/BaseEntity.php
index 695827eef2..32968b8316 100644
--- a/application/Espo/ORM/BaseEntity.php
+++ b/application/Espo/ORM/BaseEntity.php
@@ -93,7 +93,7 @@ class BaseEntity implements Entity
 
     public function __construct(
         string $entityType,
-        array $defs = [],
+        array $defs,
         ?EntityManager $entityManager = null,
         ?ValueAccessorFactory $valueAccessorFactory = null
     ) {
diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index e388706446..8fef1e379d 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -178,7 +178,7 @@ abstract class BaseQueryComposer implements QueryComposer
     protected function getSeed(?string $entityType): Entity
     {
         if (!$entityType) {
-            return new BaseEntity('_Stub');
+            return new BaseEntity('_Stub', []);
         }
 
         if (empty($this->seedCache[$entityType])) {