diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/TransportSqlListColumnsAction.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/TransportSqlListColumnsAction.java
index 62bc45e4c63..2dcc98a9b08 100644
--- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/TransportSqlListColumnsAction.java
+++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/TransportSqlListColumnsAction.java
@@ -46,12 +46,12 @@ public class TransportSqlListColumnsAction extends HandledTransportAction<SqlLis
         // TODO: This is wrong
         // See https://github.com/elastic/x-pack-elasticsearch/pull/3438/commits/61b7c26fe08db2721f0431579f215fe493744af3
         // and https://github.com/elastic/x-pack-elasticsearch/issues/3460
-        String indexPattern = hasText(request.getTablePattern()) ?
-                StringUtils.likeToIndexWildcard(request.getTablePattern(), (char) 0) : "*";
-        String regexPattern = hasText(request.getTablePattern()) ?
-                StringUtils.likeToJavaPattern(request.getTablePattern(), (char) 0) : null;
-        Pattern columnMatcher = hasText(request.getColumnPattern()) ?
-                Pattern.compile(StringUtils.likeToJavaPattern(request.getColumnPattern(), (char) 0)) : null;
+
+        String indexPattern = hasText(request.getTablePattern()) ? request.getTablePattern() : "*";
+        String regexPattern = null;
+        
+        Pattern columnMatcher = hasText(request.getColumnPattern()) ? Pattern.compile(
+                StringUtils.likeToJavaPattern(request.getColumnPattern(), (char) 0)) : null;
 
         indexResolver.resolveAsSeparateMappings(indexPattern, regexPattern, ActionListener.wrap(esIndices -> {
             List<ColumnInfo> columns = new ArrayList<>();