diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
index 13334e65c5bbf4600732a58716f47b5abc5d9d6c..c400a274e2921115d50fe16e1c7aa2773b44b764 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
@@ -38,6 +38,8 @@ public class DatabaseConfigurationContext implements DisposableBean
     private static final class BasicDataSourceFactory implements IDataSourceFactory
     {
 
+        private final int MAX_ACTIVE_NO_LIMIT = -1;
+        
         //
         // IDataSourceFactory
         //
@@ -52,6 +54,7 @@ public class DatabaseConfigurationContext implements DisposableBean
             dataSource.setPassword(password);
             dataSource.setMinIdle(0);
             dataSource.setMaxIdle(0);
+            dataSource.setMaxActive(MAX_ACTIVE_NO_LIMIT);
             return dataSource;
         }
     }