diff --git a/scripts/helmcharts/databases/charts/clickhouse/templates/configmap.yaml b/scripts/helmcharts/databases/charts/clickhouse/templates/configmap.yaml
index 709e0929e..4fdd5709d 100644
--- a/scripts/helmcharts/databases/charts/clickhouse/templates/configmap.yaml
+++ b/scripts/helmcharts/databases/charts/clickhouse/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.configOverride.serverConfig }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -8,6 +9,7 @@ data:
   {{ $filename }}: |-
 {{ $content | indent 4 }}
   {{- end }}
+{{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/scripts/helmcharts/databases/charts/clickhouse/values.yaml b/scripts/helmcharts/databases/charts/clickhouse/values.yaml
index 641d80bab..68a42f494 100644
--- a/scripts/helmcharts/databases/charts/clickhouse/values.yaml
+++ b/scripts/helmcharts/databases/charts/clickhouse/values.yaml
@@ -87,27 +87,26 @@ storageSize: 100Gi
 configOverride:
   serverConfig:
     zz-server-override.xml: |-
-    # <clickhouse>
-    #   <logger>
-    #       <level>information</level>
-    #       <console>true</console>
-    #   <log remove="remove"></log>
-    #   <errorlog remove="remove"></errorlog>
-    #   </logger>
-    #   <listen_host>0.0.0.0</listen_host>
-    #   <keep_alive_timeout>100</keep_alive_timeout>
-    #   <concurrent_threads_soft_limit_num>64</concurrent_threads_soft_limit_num>
-    #   <concurrent_threads_soft_limit_ratio_to_cores>2</concurrent_threads_soft_limit_ratio_to_cores>
-    #   <concurrent_threads_scheduler>fair_round_robin</concurrent_threads_scheduler>
-    #   <max_server_memory_usage>102400000000</max_server_memory_usage>
-    #   <max_thread_pool_size>10000</max_thread_pool_size>
-    #   <max_server_memory_usage_to_ram_ratio>0.8</max_server_memory_usage_to_ram_ratio>
-    #   <uncompressed_cache_size remove="remove"></uncompressed_cache_size>
-    #   <mmap_cache_size>26214</mmap_cache_size>
-    # </clickhouse>
+      <clickhouse>
+        <logger>
+            <level>information</level>
+            <console>true</console>
+        <log remove="remove"></log>
+        <errorlog remove="remove"></errorlog>
+        </logger>
+        <listen_host>0.0.0.0</listen_host>
+        <keep_alive_timeout>100</keep_alive_timeout>
+      </clickhouse>
     # another-config.xml: |-
     #   <clickhouse>
-    #     <another_setting>value</another_setting>
+        # <concurrent_threads_soft_limit_num>64</concurrent_threads_soft_limit_num>
+        # <concurrent_threads_soft_limit_ratio_to_cores>2</concurrent_threads_soft_limit_ratio_to_cores>
+        # <concurrent_threads_scheduler>fair_round_robin</concurrent_threads_scheduler>
+        # <max_server_memory_usage>102400000000</max_server_memory_usage>
+        # <max_thread_pool_size>10000</max_thread_pool_size>
+        # <max_server_memory_usage_to_ram_ratio>0.8</max_server_memory_usage_to_ram_ratio>
+        # <uncompressed_cache_size remove="remove"></uncompressed_cache_size>
+        # <mmap_cache_size>26214</mmap_cache_size>
     #   </clickhouse>
   userConfig:
     zz-user-override.xml: |-