diff --git a/packages/core/database/lib/entity-manager/regular-relations.js b/packages/core/database/lib/entity-manager/regular-relations.js
index 844c0d5997..68ec93dc4d 100644
--- a/packages/core/database/lib/entity-manager/regular-relations.js
+++ b/packages/core/database/lib/entity-manager/regular-relations.js
@@ -243,9 +243,8 @@ const cleanOrderColumns = async ({ id, attribute, db, inverseRelIds, transaction
         .transacting(trx);
       break;
     default: {
-      const dbConnection =
-        strapi.db.dialect.client === 'postgres' ? db.connection : db.getConnection();
-      await dbConnection
+      await db
+        .getConnection()
         .raw(
           `UPDATE ?? as a
               SET ${update.join(', ')}
diff --git a/packages/core/database/lib/index.js b/packages/core/database/lib/index.js
index 3e003fcbf7..ee9060ce28 100644
--- a/packages/core/database/lib/index.js
+++ b/packages/core/database/lib/index.js
@@ -48,9 +48,7 @@ class Database {
   }
 
   getConnection(tableName) {
-    const schema = this.connection.getSchemaName();
-    const connection = tableName ? this.connection(tableName) : this.connection;
-    return schema ? connection.withSchema(schema) : connection;
+    return tableName ? this.connection(tableName) : this.connection;
   }
 
   getSchemaConnection(trx = this.connection) {