diff --git a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/config/ClickHouseConfig.java b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/config/ClickHouseConfig.java
index d0c97c12..e0f66d6e 100644
--- a/cameleer3-server-app/src/main/java/com/cameleer3/server/app/config/ClickHouseConfig.java
+++ b/cameleer3-server-app/src/main/java/com/cameleer3/server/app/config/ClickHouseConfig.java
@@ -66,9 +66,13 @@ public class ClickHouseConfig {
             // Apply schema files using fully qualified table names
             for (String schemaFile : SCHEMA_FILES) {
                 String sql = new ClassPathResource(schemaFile).getContentAsString(StandardCharsets.UTF_8);
-                for (String statement : sql.split(";")) {
+                // Strip comment lines before splitting into statements
+                String stripped = sql.lines()
+                        .filter(line -> !line.trim().startsWith("--"))
+                        .collect(java.util.stream.Collectors.joining("\n"));
+                for (String statement : stripped.split(";")) {
                     String trimmed = statement.trim();
-                    if (!trimmed.isEmpty() && !trimmed.startsWith("--")) {
+                    if (!trimmed.isEmpty()) {
                         stmt.execute(trimmed);
                     }
                 }