diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index 839175c9b724ac68532c15859aa4164ca93f9d85..11b98b782e0399b67c4646577a416f934a1211f2 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -194,8 +194,8 @@ String transformQueryForExternalDatabase(
 
     std::stringstream out;
     IAST::FormatSettings settings(out, true);
-    settings.always_quote_identifiers = true;
     settings.identifier_quoting_style = identifier_quoting_style;
+    settings.always_quote_identifiers = identifier_quoting_style != IdentifierQuotingStyle::None;
 
     select->format(settings);