diff --git a/scripts/helmcharts/openreplay/files/clickhouse.sh b/scripts/helmcharts/openreplay/files/clickhouse.sh
index 891cc79c4..9f6a1cc73 100644
--- a/scripts/helmcharts/openreplay/files/clickhouse.sh
+++ b/scripts/helmcharts/openreplay/files/clickhouse.sh
@@ -4,6 +4,10 @@ set -ex
 
 clickhousedir=/opt/openreplay/openreplay/scripts/schema/db/init_dbs/clickhouse
 
+[[ "${CH_PASSWORD}" == "" ]] || {
+  CH_PASSWORD="--password $CH_PASSWORD"
+}
+
 function migrate() {
     echo "Starting clickhouse migration"
     IFS=',' read -r -a migration_versions <<< "$1"
@@ -11,7 +15,7 @@ function migrate() {
         echo "Migrating clickhouse version $version"
         # For now, we can ignore the clickhouse db inject errors.
         # TODO: Better error handling in script
-        clickhouse-client -h ${CH_HOST} --port ${CH_PORT} --user ${CH_USERNAME} --password ${CH_PASSWORD} --multiquery < ${clickhousedir}/${version}/${version}.sql || true
+        clickhouse-client -h ${CH_HOST} --port ${CH_PORT} --user ${CH_USERNAME} ${CH_PASSWORD} --multiquery < ${clickhousedir}/${version}/${version}.sql || true
     done
 }
 
@@ -19,7 +23,7 @@ function init() {
     echo "Initializing clickhouse"
     for file in `ls ${clickhousedir}/create/*.sql`; do
         echo "Injecting $file"
-        clickhouse-client -h ${CH_HOST} --user ${CH_USERNAME} --password ${CH_PASSWORD} --port ${CH_PORT} --multiquery < $file || true
+        clickhouse-client -h ${CH_HOST} --user ${CH_USERNAME} ${CH_PASSWORD} --port ${CH_PORT} --multiquery < $file || true
     done
 }