diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
index bf2aced6d..29ee81d22 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java
@@ -282,6 +282,7 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
     public List<DBColumn> getColumns(Long id, String catalog, String db, String table)
             throws SQLException {
         DatabaseResp databaseResp = getDatabase(id);
+        catalog = StringUtils.isEmpty(catalog) ? db : catalog;
         return getColumns(databaseResp, catalog, db, table);
     }