diff --git a/packages/core/database/lib/entity-manager/regular-relations.js b/packages/core/database/lib/entity-manager/regular-relations.js
index 27bd70dbf2..0174cae83b 100644
--- a/packages/core/database/lib/entity-manager/regular-relations.js
+++ b/packages/core/database/lib/entity-manager/regular-relations.js
@@ -10,7 +10,7 @@ const {
   hasInverseOrderColumn,
 } = require('../metadata/relations');
 const { createQueryBuilder } = require('../query');
-const { addSchema } = require('../utils/add-schema');
+const { addSchema } = require('../utils/knex');
 
 /**
  * If some relations currently exist for this oneToX relation, on the one side, this function removes them and update the inverse order if needed.
diff --git a/packages/core/database/lib/utils/add-schema.js b/packages/core/database/lib/utils/add-schema.js
deleted file mode 100644
index 356aa77ab7..0000000000
--- a/packages/core/database/lib/utils/add-schema.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const addSchema = (tableName) => {
-  const schemaName = strapi.db.connection.getSchemaName();
-  return schemaName ? `${schemaName}.${tableName}` : tableName;
-};
-
-module.exports = {
-  addSchema,
-};
diff --git a/packages/core/database/lib/utils/knex.js b/packages/core/database/lib/utils/knex.js
index 9e437d71c5..3306b37672 100644
--- a/packages/core/database/lib/utils/knex.js
+++ b/packages/core/database/lib/utils/knex.js
@@ -7,6 +7,16 @@ const isKnexQuery = (value) => {
   return value instanceof KnexBuilder || value instanceof KnexRaw;
 };
 
+/**
+ * Adds the name of the schema to the table name if the schema was defined by the user.
+ * Users can set the db schema only for Postgres in strapi database config.
+ */
+const addSchema = (tableName) => {
+  const schemaName = strapi.db.connection.getSchemaName();
+  return schemaName ? `${schemaName}.${tableName}` : tableName;
+};
+
 module.exports = {
   isKnexQuery,
+  addSchema,
 };