diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
index b0a55d53530f7dcbf1eb138d628759ffe7891246..984763055f4bc93332e750067b069313582955a4 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
@@ -50,7 +50,9 @@ public class PostgreSQLAdminDAO extends AbstractDatabaseAdminDAO
 
     private static final String CREATE_DATABASE_SQL_TEMPLATE =
             "create database %1$s with owner = \"%2$s\" encoding = 'utf8' template = template0 tablespace = pg_default; "
-                    + "alter database %1$s set default_with_oids = off;";
+                    + "alter database %1$s set default_with_oids = off; "
+                    + "alter database %1$s set join_collapse_limit = '32'; "
+                    + "alter database %1$s set from_collapse_limit = '32'; ";
 
     private static final String CREATE_PLPGSQL = "create language plpgsql;";