diff --git a/config.sample.yml b/config.sample.yml
index c149f7028..316dd6036 100644
--- a/config.sample.yml
+++ b/config.sample.yml
@@ -43,6 +43,9 @@ db:
     # pfx: path/to/cert.pfx
     # passphrase: xyz123
 
+  # Optional - PostgreSQL only:
+  schema: public
+
   # SQLite only:
   storage: path/to/database.sqlite
 
diff --git a/server/core/db.js b/server/core/db.js
index f1ac88b34..2d614c55f 100644
--- a/server/core/db.js
+++ b/server/core/db.js
@@ -138,6 +138,10 @@ module.exports = {
           switch (WIKI.config.db.type) {
             case 'postgres':
               await conn.query(`set application_name = 'Wiki.js'`)
+              // -> Set schema if it's not public             
+              if (WIKI.config.db.schema && WIKI.config.db.schema !== 'public') {
+                await conn.query(`set search_path TO ${WIKI.config.db.schema}, public;`)
+              }
               done()
               break
             case 'mysql':