diff --git a/application/Espo/Core/Utils/Id/DefaultRecordIdGenerator.php b/application/Espo/Core/Utils/Id/DefaultRecordIdGenerator.php
index 7358c785c3..148a11c8ea 100644
--- a/application/Espo/Core/Utils/Id/DefaultRecordIdGenerator.php
+++ b/application/Espo/Core/Utils/Id/DefaultRecordIdGenerator.php
@@ -41,7 +41,9 @@ class DefaultRecordIdGenerator implements RecordIdGenerator
 
     public function __construct(Metadata $metadata)
     {
-        $this->isUuid = $metadata->get(['app', 'recordId', 'dbType']) === 'uuid';
+        $this->isUuid =
+            $metadata->get(['app', 'recordId', 'type']) === 'uuid4' ||
+            $metadata->get(['app', 'recordId', 'dbType']) === 'uuid';
     }
 
     public function generate(): string