diff --git a/nominatim/api/core.py b/nominatim/api/core.py
index 1c0c4423f..c0b83f800 100644
--- a/nominatim/api/core.py
+++ b/nominatim/api/core.py
@@ -137,6 +137,10 @@ def _on_sqlite_connect(dbapi_con: Any, _: Any) -> None:
                     async with engine.begin() as conn:
                         result = await conn.scalar(sa.text('SHOW server_version_num'))
                         server_version = int(result)
+                        if server_version >= 110000:
+                            await conn.execute(sa.text("SET jit_above_cost TO '-1'"))
+                            await conn.execute(sa.text(
+                                    "SET max_parallel_workers_per_gather TO '0'"))
                 except (PGCORE_ERROR, sa.exc.OperationalError):
                     server_version = 0
 
@@ -146,8 +150,6 @@ def _on_connect(dbapi_con: Any, _: Any) -> None:
                         cursor = dbapi_con.cursor()
                         cursor.execute("SET jit_above_cost TO '-1'")
                         cursor.execute("SET max_parallel_workers_per_gather TO '0'")
-                    # Make sure that all connections get the new settings
-                    await engine.dispose()
 
             self._property_cache['DB:server_version'] = server_version