diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php
index 348cea46aa..dcb7955270 100644
--- a/application/Espo/Core/Utils/Database/Orm/Converter.php
+++ b/application/Espo/Core/Utils/Database/Orm/Converter.php
@@ -707,7 +707,9 @@ class Converter
         $result = [];
 
         foreach ($defs['relations'] as $relationParams) {
-            if ($relationParams['type'] !== 'manyMany') continue;
+            if ($relationParams['type'] !== 'manyMany') {
+                continue;
+            }
 
             $relationEntityType = ucfirst($relationParams['relationName']);
 
@@ -717,7 +719,7 @@ class Converter
                     'id' => [
                         'type' => 'id',
                         'autoincrement' => true,
-                        'dbType' => 'varchar',
+                        'dbType' => 'bigint', // ignored because of `skipRebuild`
                     ],
                     'deleted' => [
                         'type' => 'bool'
diff --git a/application/Espo/Core/Utils/Database/Schema/Converter.php b/application/Espo/Core/Utils/Database/Schema/Converter.php
index 17f1abab3f..ee9ec306d7 100644
--- a/application/Espo/Core/Utils/Database/Schema/Converter.php
+++ b/application/Espo/Core/Utils/Database/Schema/Converter.php
@@ -331,11 +331,13 @@ class Converter
 
         $table = $this->getSchema()->createTable($tableName);
 
-        $table->addColumn('id', 'int', $this->getDbFieldParams(array(
+        $columnOptions = $this->getDbFieldParams([
             'type' => 'id',
-            'len' => $this->defaultLength['int'],
+            'len' => 20,
             'autoincrement' => true,
-        )));
+        ]);
+
+        $table->addColumn('id', 'bigint', $columnOptions);
 
         //add midKeys to a schema
         $uniqueIndex = [];