diff --git a/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala b/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala
index fe804f2856..d137c71ee9 100644
--- a/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala
+++ b/modules/fts-psql/src/test/scala/docspell/ftspsql/PgFixtures.scala
@@ -30,7 +30,7 @@ trait PgFixtures {
     )
 
   def jdbcConfig(cnt: PostgreSQLContainer): JdbcConfig =
-    JdbcConfig(LenientUri.unsafe(cnt.jdbcUrl), cnt.username, cnt.password)
+    JdbcConfig(LenientUri.unsafe(cnt.jdbcUrl), cnt.username, cnt.password, 10)
 
   def dataSource(cnt: PostgreSQLContainer): Resource[IO, DataSource] =
     StoreFixture.dataSource(jdbcConfig(cnt))
diff --git a/modules/joex/src/main/resources/reference.conf b/modules/joex/src/main/resources/reference.conf
index ae62b130a9..ef10080ab9 100644
--- a/modules/joex/src/main/resources/reference.conf
+++ b/modules/joex/src/main/resources/reference.conf
@@ -53,6 +53,8 @@ docspell.joex {
 
     # The database password.
     password = ""
+    # The default maximum pool size for hikari JDBC-backen (10 is the default of hikari)
+    maximum-pool-size = 10
   }
 
   # Additional settings related to schema migration.
@@ -827,6 +829,7 @@ Docpell Update Check
         url = "jdbc:postgresql://server:5432/db"
         user = "pguser"
         password = ""
+        maximum-pool-size = 10
       }
 
       # A mapping from a language to a postgres text search config. By
diff --git a/modules/restserver/src/main/resources/reference.conf b/modules/restserver/src/main/resources/reference.conf
index 8d2a75396f..0a69e132fc 100644
--- a/modules/restserver/src/main/resources/reference.conf
+++ b/modules/restserver/src/main/resources/reference.conf
@@ -356,6 +356,7 @@ docspell.server {
         url = "jdbc:postgresql://server:5432/db"
         user = "pguser"
         password = ""
+        maximum-pool-size = 10
       }
 
       # A mapping from a language to a postgres text search config. By
@@ -405,6 +406,8 @@ docspell.server {
 
       # The database password.
       password = ""
+      # The default maximum pool size for hikari JDBC-backen (10 is the default of hikari)
+      maximum-pool-size = 10
     }
 
     # Additional settings related to schema migration.
diff --git a/modules/store/src/main/scala/docspell/store/JdbcConfig.scala b/modules/store/src/main/scala/docspell/store/JdbcConfig.scala
index 65fdf3a0cb..601060a409 100644
--- a/modules/store/src/main/scala/docspell/store/JdbcConfig.scala
+++ b/modules/store/src/main/scala/docspell/store/JdbcConfig.scala
@@ -8,7 +8,12 @@ package docspell.store
 
 import docspell.common.LenientUri
 
-case class JdbcConfig(url: LenientUri, user: String, password: String) {
+case class JdbcConfig(
+    url: LenientUri,
+    user: String,
+    password: String,
+    maximumPoolSize: Int
+) {
 
   val dbms: Db =
     JdbcConfig.extractDbmsName(url).fold(sys.error, identity)
diff --git a/modules/store/src/main/scala/docspell/store/Store.scala b/modules/store/src/main/scala/docspell/store/Store.scala
index 101724a342..f685c266d5 100644
--- a/modules/store/src/main/scala/docspell/store/Store.scala
+++ b/modules/store/src/main/scala/docspell/store/Store.scala
@@ -59,6 +59,7 @@ object Store {
         ds.setUsername(jdbc.user)
         ds.setPassword(jdbc.password)
         ds.setDriverClassName(jdbc.dbms.driverClass)
+        ds.setMaximumPoolSize(jdbc.maximumPoolSize)
       }
       logh = DoobieLogging[F](docspell.logging.getLogger[F])
       xa = HikariTransactor[F](ds, connectEC, Some(logh))
diff --git a/modules/store/src/test/scala/docspell/store/DatabaseTest.scala b/modules/store/src/test/scala/docspell/store/DatabaseTest.scala
index e927dc4e69..431d8ec248 100644
--- a/modules/store/src/test/scala/docspell/store/DatabaseTest.scala
+++ b/modules/store/src/test/scala/docspell/store/DatabaseTest.scala
@@ -111,7 +111,7 @@ trait DatabaseTest
 
 object DatabaseTest {
   private def jdbcConfig(cnt: JdbcDatabaseContainer) =
-    JdbcConfig(LenientUri.unsafe(cnt.jdbcUrl), cnt.username, cnt.password)
+    JdbcConfig(LenientUri.unsafe(cnt.jdbcUrl), cnt.username, cnt.password, 10)
 
   private def makeDataSourceFixture(cnt: IO[JdbcDatabaseContainer]) =
     for {
diff --git a/modules/store/src/test/scala/docspell/store/StoreFixture.scala b/modules/store/src/test/scala/docspell/store/StoreFixture.scala
index b1254d132a..a7aa7fcbb6 100644
--- a/modules/store/src/test/scala/docspell/store/StoreFixture.scala
+++ b/modules/store/src/test/scala/docspell/store/StoreFixture.scala
@@ -53,7 +53,8 @@ object StoreFixture {
         s"jdbc:h2:mem:$dbname;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE;DB_CLOSE_DELAY=-1"
       ),
       "sa",
-      ""
+      "",
+      10
     )
 
   def fileDB(file: Path): JdbcConfig =
@@ -62,7 +63,8 @@ object StoreFixture {
         s"jdbc:h2:file://${file.absolute.toString};MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE"
       ),
       "sa",
-      ""
+      "",
+      10
     )
 
   def dataSource(jdbc: JdbcConfig): Resource[IO, DataSource] = {