diff --git a/packages/core/database/lib/entity-manager/index.js b/packages/core/database/lib/entity-manager/index.js
index a973fe6bf3..9485d98822 100644
--- a/packages/core/database/lib/entity-manager/index.js
+++ b/packages/core/database/lib/entity-manager/index.js
@@ -869,7 +869,6 @@ const createEntityManager = (db) => {
                     ],
                   })
                   .where(joinTable.on || {})
-                  .sort(orderColumnName, 'ASC')
                   .transacting(trx)
                   .execute();
 
diff --git a/packages/core/database/lib/entity-manager/relations-orderer.js b/packages/core/database/lib/entity-manager/relations-orderer.js
index a34a4fd3c7..9d0357c8c0 100644
--- a/packages/core/database/lib/entity-manager/relations-orderer.js
+++ b/packages/core/database/lib/entity-manager/relations-orderer.js
@@ -40,7 +40,7 @@ const relationsOrderer = (initArr, idColumn, orderColumn) => {
     order: r[orderColumn],
   }));
 
-  const maxOrder = _.maxBy('order', arr).order;
+  const maxOrder = _.maxBy('order', arr)?.order || 0;
 
   // TODO: Improve performance by using a map
   const findRelation = (id) => {