diff --git a/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java b/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java
index 5a23f91ba..e548a90f9 100644
--- a/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java
+++ b/client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java
@@ -239,7 +239,7 @@ public <T> T getDefObjVal() {
     // Key used to identify default value in configuration map
     public static final String DEFAULT_KEY = "_default_";
 
-    public static final String NO_THROW_ON_UNKNOWN_CONFIG = "no_throw_on_unknown_config";
+    public static final String IGNORE_UNKNOWN_CONFIG_KEY = "ignore_unknown_config_key";
 
     public static String serverSetting(String key) {
         return SERVER_SETTING_PREFIX + key;
@@ -363,10 +363,10 @@ public static Map<String, Object> parseConfigMap(Map<String, String> configMap)
             }
         }
 
-        tmpMap.remove(ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG);
+        tmpMap.remove(ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY);
         if (!tmpMap.isEmpty()) {
             String msg = "Unknown and unmapped config properties: " + tmpMap.keySet();
-            if (configMap.containsKey(NO_THROW_ON_UNKNOWN_CONFIG)) {
+            if (Boolean.parseBoolean(String.valueOf(configMap.get(IGNORE_UNKNOWN_CONFIG_KEY)))) {
                 LOG.warn(msg);
             } else {
                 throw new ClientMisconfigurationException(msg);
diff --git a/client-v2/src/test/java/com/clickhouse/client/ClientTests.java b/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
index 52815237b..08cd233f6 100644
--- a/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/ClientTests.java
@@ -502,7 +502,7 @@ public void testUnknownClientSettings() throws Exception {
             Assert.assertTrue(ex.getMessage().contains("unknown_setting"));
         }
 
-        try (Client client = newClient().setOption(ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG, "what ever").setOption("unknown_setting", "value").build()) {
+        try (Client client = newClient().setOption(ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY, "true").setOption("unknown_setting", "value").build()) {
             Assert.assertTrue(client.ping());
         }
 
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/DriverTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/DriverTest.java
index 217509344..59f75883f 100644
--- a/jdbc-v2/src/test/java/com/clickhouse/jdbc/DriverTest.java
+++ b/jdbc-v2/src/test/java/com/clickhouse/jdbc/DriverTest.java
@@ -194,6 +194,6 @@ public void testUnknownSettings() throws Exception {
         }
 
         // next should not throw exception
-        driver.connect(getEndpointString() + "?unknown_setting=1&" + ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG + "=1", new Properties()).close();
+        driver.connect(getEndpointString() + "?unknown_setting=1&" + ClientConfigProperties.IGNORE_UNKNOWN_CONFIG_KEY + "=true", new Properties()).close();
     }
 }