diff --git a/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/init/AnalyticsDatabaseInit.java b/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/init/AnalyticsDatabaseInit.java
index 1bce670ce47..5db921c25c5 100644
--- a/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/init/AnalyticsDatabaseInit.java
+++ b/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/init/AnalyticsDatabaseInit.java
@@ -127,7 +127,9 @@ private void createClickHouseNamedCollection() {
             "port", config.getIntProperty(ConfigurationKey.CONNECTION_PORT),
             "database", config.getProperty(ConfigurationKey.CONNECTION_DATABASE),
             "username", config.getProperty(ConfigurationKey.CONNECTION_USERNAME),
-            "password", config.getProperty(ConfigurationKey.CONNECTION_PASSWORD));
+            "password", config.getProperty(ConfigurationKey.CONNECTION_PASSWORD),
+            "connection_pool_size", "100",
+            "replace_query", "1");
 
     ClickHouseSqlBuilder clickHouseSqlBuilder = new ClickHouseSqlBuilder();